2a7cb03875
Merge branch 'main' of https://github.com/mastodon/mastodon
2021-10-22 10:36:12 +02:00
Eugen Rochko
771c9d4ba8
Add ability to skip sign-in token authentication for specific users ( #16427 )
...
Remove "active within last two weeks" exception for sign in token requirement
Change admin reset password to lock access until the password is reset
2021-07-08 05:31:28 +02:00
9598bce610
Merge branch 'main' of https://github.com/tootsuite/mastodon
2021-05-24 11:09:13 +02:00
Claire
67c5cdea40
Fix some ignored brakeman warnings ( #15829 )
2021-03-07 07:06:56 +01:00
c1ce0d49c8
Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020
2020-12-24 16:38:36 +01:00
ThibG
8357969559
Fix admins being able to suspend their instance actor ( #14567 )
...
* Fix admin being able to suspend their own instance account
* Add text about the instance's own actor in admin view
* Change instance actor notice from flash message to template
* Do not list local instance actor in account moderation list
2020-12-15 17:23:58 +01:00
Mashiro
75d2762fdf
Add "invite request content" display in user account admin page ( #15265 )
...
* feat: display `invite_request_text` in admin's user account page
* fix: move invite_request to the bottom of accounts page
* fix: remove time display, remove formate, change code terminology
* fix: remove escape
2020-12-15 06:28:14 +01:00
8d6362e3e5
merge with master, add todo for statuses
2020-11-26 13:27:40 +01:00
Takeshi Umeda
d6fe0c94ca
Add account sensitized ( #14361 )
...
* Add account sensitized
* Fix i18n normalize
* Fix description and spec
* Fix spec
* Fix wording
2020-11-04 20:45:01 +01:00
2d77a5e767
merge master
2020-11-01 09:55:09 +01:00
Takeshi Umeda
070026e634
Fix method of the DELETE DATA button ( #14855 )
2020-09-21 20:37:19 +02:00
aff743695a
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/features/account/components/header.js
# config/webpack/production.js
# db/schema.rb
# yarn.lock
2020-09-21 14:36:15 +02:00
Eugen Rochko
ed099d8bdc
Change account suspensions to be reversible by default ( #14726 )
2020-09-15 14:37:58 +02:00
c3f46d6b28
Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master
2020-07-17 20:49:44 +02:00
Mélanie Chauvel
08cf81f8c1
Improve appearence consistency of settings pages ( #13938 )
...
* Fix header button changing header size in settings pages
* Make form buttons look more like a part of the form in settings pages
- Put buttons closer, using same distance as between inputs
- Make buton font size a bit smaller to blend a bit more
- Add the class button to button tags for consisent styling
2020-06-26 00:36:30 +02:00
ThibG
b8ba977497
Fix admin-facing uses of inline CSS ( #13575 )
...
* Move .back-button inline styles to CSS file
All occurrences of the back-button CSS class used the same inline
CSS rules, so moved them over to the CSS file
* Fix “Add new domain block” button using inline CSS
* Replace common pattern of inline-styled button boxes by a CSS class
In particular, switching from `float: left/right` to a flexbox with
`justify-content: space-between`. This implied changing the order of
a few HTML tags and adding an empty `div` in one case.
Also removed a `margin-bottom` rule that wasn't needed due to the
margins of surrounding elements.
* Move account admin view inline CSS to CSS file
2020-04-28 19:39:16 +02:00
Eugen Rochko
5edff32733
Change delivery failure tracking to work with hostnames instead of URLs ( #13437 )
2020-04-15 20:33:24 +02:00
e50cb7160a
🐛 add icons in dropdown menu, fix style for this dropdown
...
Merge remote-tracking branch 'origin'
Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>
# Conflicts:
# .ruby-version
# app/javascript/mastodon/components/status.js
# app/javascript/mastodon/features/direct_timeline/components/conversation.js
# app/javascript/mastodon/features/getting_started/components/announcements.js
# app/javascript/mastodon/locales/fr.json
# config/locales/kab.yml
# config/locales/ta.yml
# yarn.lock
2020-04-09 17:33:58 +02:00
Eugen Rochko
f65568f1d4
Add ability to filter audit log in admin UI ( #13381 )
2020-04-03 13:06:34 +02:00
Eugen Rochko
bea0bb39d6
Add option to include resolved DNS records when blacklisting e-mail domains in admin UI ( #13254 )
...
* Add shortcuts to blacklist a user's e-mail domain in admin UI
* Add option to blacklist resolved MX and IP records for e-mail domains
2020-03-12 22:35:20 +01:00
158c51edc1
accept merge from upstream
2020-03-08 17:32:42 +01:00
ThibG
4a4cd686c1
Add sorting by username, creation and last activity in moderation view ( #13076 )
...
* Add ability to order accounts in moderation view
* Display last status date in “Most recent activity” for remote users
2020-03-08 15:39:13 +01:00
2485c822be
merge with master for security update of v3.1.2
2020-02-27 14:24:07 +01:00
ThibG
4dec392ea8
Fix account's bio not being shown if there are no proofs/fields in admin UI ( #13075 )
2020-02-17 16:38:59 +01:00
c246d20d80
fix mess footer
2020-02-01 17:29:30 +01:00
Eugen Rochko
ce1dee85b5
Fix relationships page not showing results in admin UI ( #12934 )
...
Follow-up to #12927
2020-01-24 00:20:23 +01:00
Eugen Rochko
c0006a004d
Change followers page to relationships page in admin UI ( #12927 )
...
Allow browsing and filtering all relationships instead of just
followers, unify the codebase with the user-facing relationship
manager, add ability to see who the user invited
2020-01-23 20:33:20 +01:00
Eugen Rochko
02063c245c
Fix not all of account's active IPs showing up in admin UI ( #12909 )
2020-01-20 18:00:54 +01:00
Eugen Rochko
6feafb8802
Various fixes and improvements ( #12878 )
...
* Fix unused role routes being generated
* Remove unused JavaScript code
* Refactor filters code to be DRYer
* Fix `.count == 0` comparisons to `.empty?` in views
* Fix filters in views
2020-01-20 15:55:03 +01:00
tykayn
046b9ed6f8
⚡ link to suspend account
2019-12-20 14:30:13 +01:00
4e336c8e6b
⚡ fix account admin info, and links in the footer on the left
2019-12-18 12:52:46 +01:00
e5ddc8221c
hop
2019-12-02 16:36:59 +01:00
11418ca8a9
⚡ merge with gh master
2019-12-02 16:35:37 +01:00
08755fbae2
hop
2019-12-02 16:33:04 +01:00
d806ddd7ab
tpl links
2019-12-02 15:17:12 +01:00
4fc6389204
🐛 indent accounts
2019-12-02 15:08:56 +01:00
ThibG
15c192ce40
Add link to search for users connected from the same IP address ( #12157 )
...
* Add link to search for users connected from the same IP address
Fixes #11949
* Fix missing cell in admin account view table
2019-10-24 22:49:26 +02:00
Mastodon
f887a3486c
fix columns of accounts
2019-10-15 15:00:20 +00:00
c583362748
statuses count in admin accounts
2019-10-15 16:09:10 +02:00
8f3b2f6749
counters for admin account
2019-10-15 15:55:54 +02:00
tykayn
e01b405c17
Merge branch 'master' of https://github.com/tootsuite/mastodon
2019-09-22 10:40:03 +02:00
ThibG
ec2a439a22
Add account bio to account admin view ( #11473 )
...
* Add account bio to account admin view
* Change styling to make bio fields / content more readable
2019-09-09 14:15:52 +02:00
8686311aaf
⚡ more data in user list
2019-08-23 14:16:44 +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
Eugen Rochko
b851456139
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id ( #11247 )
2019-07-07 16:16:51 +02:00
Eugen Rochko
e1d0390e29
Add batch actions for approving and rejecting pending accounts ( #10469 )
2019-04-06 17:53:45 +02:00
Eugen Rochko
51e154f5e8
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
2019-03-14 05:28:30 +01:00
ThibG
3a8cb6c737
Add quick link from admin account view to block/unblock instance ( #10073 )
2019-02-18 14:59:46 +01:00
ThibG
2f7f6af26a
Hide domain filter in admin page when “local” filter is active ( #10074 )
...
Since the “domain” field is ignored in this case.
2019-02-18 13:37:13 +01:00
Eugen Rochko
6e49907ecf
Improve admin UI for account view ( #9643 )
2018-12-28 03:38:41 +01:00
