536 Commits (3ef5f62abfc65085604265cfa2559b4d9ae98ace)

Author SHA1 Message Date
Thibaut Girka a01674fb2b Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Mélanie Chauvel 08cf81f8c1
Improve appearence consistency of settings pages (#13938)
4 years ago
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
ThibG bf6745b9c3
Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)
4 years ago
Mélanie Chauvel 77619b1654
Put “Add new domain block” button on /admin/instances in header (#13934)
4 years ago
Thibaut Girka 9e04b9d8df Add support for setting Content Warning for CW-less outgoing toots
4 years ago
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG c0b849bdfd
Fix use of inline CSS in public pages (#13576)
5 years ago
Thibaut Girka a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG b8ba977497
Fix admin-facing uses of inline CSS (#13575)
5 years ago
Thibaut Girka 81e49ba5c6 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 5edff32733
Change delivery failure tracking to work with hostnames instead of URLs (#13437)
5 years ago
Thibaut Girka ec6464f8d0 Fix admin audit log crash due to glitch-soc theming changes
5 years ago
Thibaut Girka 8fef96cbf5 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko f65568f1d4
Add ability to filter audit log in admin UI (#13381)
5 years ago
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko bea0bb39d6
Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)
5 years ago
Eugen Rochko f556f79b77
Add titles to warning presets in admin UI (#13252)
5 years ago
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
guigeekz e31ba618d4
Add submit button to the top of preferences pages (#13068)
5 years ago
ThibG 2423d2f677
Add ability to delete files uploaded for settings in admin UI (#13192)
5 years ago
ThibG 4a4cd686c1
Add sorting by username, creation and last activity in moderation view (#13076)
5 years ago
Thibaut Girka e037002401 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 4dec392ea8
Fix account's bio not being shown if there are no proofs/fields in admin UI (#13075)
5 years ago
Thibaut Girka 44744e3ce1 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 305abc9e05
Fix design of announcements in admin UI (#12989)
5 years ago
Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 663ea84b08
Add publish/unpublish controls to announcements in admin UI (#12967)
5 years ago
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko ce1dee85b5
Fix relationships page not showing results in admin UI (#12934)
5 years ago
Eugen Rochko f52c988e12
Add announcements (#12662)
5 years ago
Eugen Rochko c0006a004d
Change followers page to relationships page in admin UI (#12927)
5 years ago
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 02063c245c
Fix not all of account's active IPs showing up in admin UI (#12909)
5 years ago
ThibG 91e4955e08 Fix admin interface crashing when listing boosts with non-video media attachments (#12907)
5 years ago
Eugen Rochko 6feafb8802
Various fixes and improvements (#12878)
5 years ago
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master
5 years ago
Eugen Rochko 1ded3bb752
Change reported media attachments to always be hidden in admin UI (#12879)
5 years ago
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Sasha Sorokin 36426ed4ad Use heading actions and placeholders in settings (#12801)
5 years ago
Sasha Sorokin 139f7646a7 Rename page_heading_actions variable (#12799)
5 years ago
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 162dc845a0 Fix batch actions on non-pending tags in admin interface (#12537)
5 years ago
Thibaut Girka e79fca176b Fix issue because of theming system
5 years ago
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master
5 years ago
Alice Gaudon 668f698077 Admin setting to disable default follows (#12566)
5 years ago
Sasha Sorokin 34aa5c7cb2 Improve report page structure (#12615)
5 years ago
Sasha Sorokin d5b7a4b116 Avoid using pluralize on moderation pages (#12589)
5 years ago
Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 4195039420 Link to reports targetting instance in admin view (#12513)
5 years ago
Thibaut Girka 99f1f48741 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG d8f96028c5 Add ability to filter reports by target account domain (#12154)
5 years ago
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 15c192ce40 Add link to search for users connected from the same IP address (#12157)
5 years ago
ThibG aa884e0484 Fix batch actions being hidden from mobile view (#12183)
5 years ago
BSKY fccf83e1f2 Add noopener and/or noreferrer (#12202)
5 years ago
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 30a28a2eb7
Fix not showing if emoji has a local counterpart in admin UI (#12135)
5 years ago
Eugen Rochko c8bcf5cbfd
Add admin setting to auto-approve hashtags (#12122)
5 years ago
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
mayaeh b258583d2b Fix hashtag link to directory in AdminUI (#12005)
5 years ago
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 7a39671d46
Fix hashtag batch actions not redirecting back with right filters (#11962)
5 years ago
Takeshi Umeda 4fe5f8f3c7 Add full numeric notation to the dashboard title attribute (#11911)
5 years ago
Eugen Rochko 450639a406
Fix hashtag batch actions being unavailable on pending review page (#11897)
5 years ago
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
mayaeh 75c6ad500d Fixed not being able to display review pending hashtags in the admin UI. (#11875)
5 years ago
mayaeh ef0d22f232 Add search and sort functions to hashtag admin UI (#11829)
5 years ago
Takeshi Umeda b7420b8643 Change dashboard to short number notation (#11847)
5 years ago
mayaeh 1511638975 Change the hashtag link from WebUI to public page (#11845)
5 years ago
Thibaut Girka 5477726f50 Fix upstream changes breaking because of glitch-soc's theming engine
5 years ago
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Tao Bror Bojlén 4fe127664b add admin setting for default search engine indexing (fix #11750) (#11804)
5 years ago
ThibG 17389c63c8 Change /admin/custom_emoji to honor the auto_play_gif setting (#11801)
5 years ago
Eugen Rochko 1110ea1a91
Add batch actions and categories to admin UI for custom emojis (#11793)
5 years ago
Eugen Rochko 14d4a783cd
Fix display of instance actor in reports UI (#11798)
5 years ago
ThibG ec2a439a22 Add account bio to account admin view (#11473)
5 years ago
Eugen Rochko 261e52268c
Add batch approve/reject for pending hashtags in admin UI (#11791)
5 years ago
Thibaut Girka 5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG c1e238a77b Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)
5 years ago
Eugen Rochko ec1dd865fb
Fix error in admin UI for hashtag usage breakdown (#11743)
5 years ago
Eugen Rochko 47584180d8
Fix wrong percentages in admin UI for hashtag usage breakdown (#11714)
5 years ago
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 73ca0bb925
Add option to include reported statuses in warning e-mail (#11639)
5 years ago
Eugen Rochko 282ea17078
Add soft delete for statuses for instant deletes through API (#11623)
5 years ago
mayaeh e9c3d1ef46 Fix the whitelist mode display not being enabled in the admin dashboard (#11634)
5 years ago
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 9b6a5ed109 Add public blocks to /about/blocks (#11298)
5 years ago
Thibaut Girka c4ae7aab6f Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 898dacf83e
Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)
5 years ago
Thibaut Girka 9b8edbea5b Fix domain block edition in glitch-soc
5 years ago
Thibaut Girka ebc0521ba8 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 3a6b6c63f2
Add breakdown of usage by source to admin UI for hashtags (#11517)
5 years ago
ThibG bced70469a Add domain block notes (#11515)
5 years ago
Eugen Rochko 94c54997cf
Fix trending tags returning less items than requested sometimes (#11513)
5 years ago
Eugen Rochko 7a737c79cc
Add number of pending accounts and pending hashtags to admin dashboard (#11514)
5 years ago
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko dd38c280a5
Fix admin dashboard missing latest features (#11505)
5 years ago
Eugen Rochko 9072fe5ab6
Add trends UI with admin and user settings (#11502)
5 years ago
Thibaut Girka cad2e6eb7a Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 115dab78f1
Change admin UI for hashtags and add back whitelisted trends (#11490)
5 years ago
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 24552b5160
Add whitelist mode (#11291)
5 years ago
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG 7e2b6da57f Add setting to disable the anti-spam (#11296)
5 years ago
Eugen Rochko b851456139
Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)
5 years ago
Eugen Rochko 23aeef52cc
Remove Salmon and PubSubHubbub (#11205)
5 years ago
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko 1b052c7b2d
Remove expensive counters from federation page in admin UI (#11139)
5 years ago
Alix Rossi 26d3b2efce Add label for admin theme selector (#11121)
5 years ago
Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Eugen Rochko a60364ca7d
Add waiting time to list of pending accounts in admin UI (#10985)
5 years ago
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 14f6ce2885 Record account suspend/silence time and keep track of domain blocks (#10660)
6 years ago
Thibaut Girka 2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
nzws be851321c0 Use local time in audit log (#10751)
6 years ago
Thibaut Girka fcbf557bd2 Add site-wide options to show reblogs and replies in local/public timelines
6 years ago
Thibaut Girka 93199c9566 Fix keybase indication on dashboard
6 years ago
Thibaut Girka d83068016b Allow turning keybase off instance-wide
6 years ago
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8b69a66380 Add "why do you want to join" field to invite requests (#10524)
6 years ago
ThibG 5247ea4efd Fix batch actions not working on pending accounts (#10508)
6 years ago
Thibaut Girka 63837a4b78 Fix pending accounts management
6 years ago
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e1d0390e29
Add batch actions for approving and rejecting pending accounts (#10469)
6 years ago
Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e117964325
Change icons of features on admin dashboard to remove bias (#10366)
6 years ago
Eugen Rochko 94e5e834f2
Improve performance of list of blocked domains by caching counts (#10374)
6 years ago
Eugen Rochko 555c4e11ba
Add validations to admin settings (#10348)
6 years ago
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ff565524aa
Fix maxed-out invites not showing up as expired in UI (#10274)
6 years ago
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 51e154f5e8
Admission-based registrations mode (#10250)
6 years ago
Eugen Rochko 6e3936aa6f
Improve invites list with click-to-copy inputs (#10259)
6 years ago
Thibaut Girka ff0576cc2b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 359d26a053 Fix “reset” button of instance filter switching to custom emoji admin panel (#10076)
6 years ago
ThibG 3a8cb6c737 Add quick link from admin account view to block/unblock instance (#10073)
6 years ago
ThibG 6840a77711 Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
6 years ago
ThibG 2f7f6af26a Hide domain filter in admin page when “local” filter is active (#10074)
6 years ago
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 1ac9a3f4bb Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)
6 years ago
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a269ffdfa5
Change "federation" admin UI link to point to "limited" domains (#9762)
6 years ago
Eugen Rochko 1c6588accc
Redesign admin instances area (#9645)
6 years ago
ThibG 6f9a7bd02c Add quick links to the admin interface in the WebUI (#8545)
6 years ago
Eugen Rochko c39c112ced
Fix admin UI view of local followers (#9712)
6 years ago
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6e49907ecf
Improve admin UI for account view (#9643)
6 years ago
chr v1.x c3465f699e Add local followers page to admin account UI (#9610)
6 years ago
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3c033c4352
Add moderation warnings (#9519)
6 years ago
Thibaut Girka a1c56fcef1 Add admin setting to disable followers count
6 years ago
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 11a91592aa Restore profile links in /admin/accounts (#9494)
6 years ago
ThibG cf6ee4ff24 Add admin ability to remove an user's header image (#9495)
6 years ago
ThibG 720daa8143 Add instance-wide setting to disable profile directory (#9497)
6 years ago
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73be8f38c1
Add profile directory (#9427)
6 years ago
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73faadad28
Redesign admin accounts index (#9340)
6 years ago
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko fd5285658f
Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko 9486f0ca77
Add "disable" button to report screen (#9024)
6 years ago
Thibaut Girka 3d5d899094 Allow selecting both default flavour and theme
6 years ago
Eugen Rochko 9d4541c612
Display customized mascot in web UI and fix admin form for it (#8964)
6 years ago
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 2dba313100 Replace SVG asset with Custom mascot (#8766)
6 years ago
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e645ae9561
Change admin accounts default sort to most recent (#8813)
6 years ago
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi c6d43115c2 Fix broken report detail (regression from #8569) (#8795)
6 years ago
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f4d549d300
Redesign forms, verify link ownership with rel="me" (#8703)
6 years ago
Eugen Rochko 011437dcb5
Group reports by target account (#8674)
6 years ago
Thibaut Girka 7ea4c793d6 Allow to show a specific status in the admin interface
6 years ago
Thibaut Girka 43d132039b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5e1767173f
Display pending message on admin relays UI (#8494)
6 years ago
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
M Somerville b31449cd77 Better singulars of account followers/toots. (#8471)
6 years ago
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
M Somerville 29da56cf75 Hide reject media checkbox when not relevant. (#8426)
6 years ago
M Somerville ac092d03e7 Add missing video descriptions (#8416)
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a2cabf3f4a
Add admin custom CSS setting (#8399)
6 years ago
Jakub Mendyk 6cb3514d64 Add ability to change an instance default theme from the administration panel (#7092) (#8381)
6 years ago
Thibaut Girka e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2374a00c10
Add confirmation step to account suspensions (#8353)
6 years ago
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 9dd5639f90
Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 625b5a567b Get rid of the Content Warning rainbows (#8129)
6 years ago
Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc56f2230a
Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8241f162df
Fix tag usage display on admin dashboard
6 years ago
Eugen Rochko 0d13e30ad2
Display trending hashtags on admin dashboard (#8038)
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2354b10eb5
Add admin dashboard (#8029)
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko f89c595ea0
Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
6 years ago
Yamagishi Kazutoshi c0fc4e9935 Remove unnecessary underline on accounts table (#7728)
6 years ago
Jenkins f93806ea55 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 40ef46dbef
Display only domain of report account if remote under comment (#7574)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 0f2fbf7d05 Improvements to toots display in admin view (#7452)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 61a9018607
Enable custom emojis in profiles (notes, field values, display names) (#7374)
7 years ago
Shuhei Kitagawa bd10a7e480 Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko c7d1a2e400
Improve admin UI for accounts (#7360)
7 years ago
David Yip 77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 251bbf9728
Show remote reports in admin UI as coming from domain rather than user (#7347)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko a9c440637c
Improve report layout (#7188)
7 years ago
Jenkins ed17e173d6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith b9c35785e2 Reports: Merge contents and comment columns (#7189)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Emelia Smith 204d72fbe4 Feature: add count of account notes to reports (#7130)
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 4ec9d8b4d9 Display deleted users' role as “Suspended” (#6339)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix a56c4742d3 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
Jenkins 6d00ca1c71 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 6eb60260b1 Display deleted users' role as “Suspended” (#6080)
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko 20a6584d2d
Clean up admin UI for accounts (#6004)
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
Yamagishi Kazutoshi 74320971e2 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi df03042a6e Allow admin to deactivate invite created by users (#5860)
7 years ago
Yamagishi Kazutoshi 15fab79cfa Show "expired" in invite index (#5838)
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
unarist e28b33c89c Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago