2a7cb03875
Merge branch 'main' of https://github.com/mastodon/mastodon
2021-10-22 10:36:12 +02:00
Eugen Rochko
07341e7aa6
Add graphs and retention metrics to admin dashboard ( #16829 )
2021-10-14 20:44:59 +02:00
c1ce0d49c8
Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020
2020-12-24 16:38:36 +01:00
ThibG
47e507fa61
Add ability to require invite request text ( #15326 )
...
Fixes #15273
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-14 10:03:09 +01:00
ThibG
a7e819b8a8
Fix dynamic updating of “Bootstrap timeline accounts” admin setting ( #15325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-14 09:37:58 +01:00
2d77a5e767
merge master
2020-11-01 09:55:09 +01:00
ThibG
4c45b43cb8
Change how CDN_HOST is passed down to make assets build reproducible ( #14381 )
...
* Change how CDN_HOST is passed down to make assets build reproducible
* Change webpacker/webpack configuration to dynamically load publicPath based on meta header
* Fix embedded layout missing the cdn-host meta header
2020-10-13 01:19:35 +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
Shlee
221eda646b
Migrate Rails ujs as required for Rails 6 Upgrade. ( #13280 )
...
* Update yarn.lock
* Update package.json
* Update public.js
* Update admin.js
* Update log_out.js
* Update common.js
2020-03-21 03:14:50 +01:00
Alice Gaudon
668f698077
Admin setting to disable default follows ( #12566 )
2019-12-16 23:55:50 +01:00
ThibG
c1e238a77b
Fix admin interface showing superfluous reject media/reports on suspended blocks ( #11749 )
...
* Fix admin interface showing superfluous reject media/reports on suspended domains
* Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
2019-09-03 22:53:27 +02:00
Eugen Rochko
fd5285658f
Add option to block reports from domain ( #8830 )
2018-10-20 08:02:44 +02:00
M Somerville
29da56cf75
Hide reject media checkbox when not relevant. ( #8426 )
2018-08-25 13:26:17 +02:00
ThibG
be0b372a22
Fix admin.js starting rails-ujs twice ( fixes #8168 ) ( #8213 )
2018-08-15 23:38:31 +02:00
Yamagishi Kazutoshi
e9b322d0a6
Upgrade webpack to version v4.x ( #6655 )
2018-07-14 03:56:41 +02:00
Eugen Rochko
a9c440637c
Improve report layout ( #7188 )
...
* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue
2018-04-20 02:28:48 +02:00
abcang
8cd2828e91
Fix hide and show media button on admin page ( #6347 )
2018-01-24 13:29:46 +01:00
abcang
4d42a38954
Improve admin page ( #4121 )
...
* Improve admin page
* Fix test
* Add spec
* Improve select style
2017-07-18 16:38:22 +02:00
