1
0
Commit Graph

24 Commits

Author SHA1 Message Date
Claire
cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
prplecake
c618d3a0a5
Make "No $entity selected" errors more accurate ()
Previously all controllers would use the single "No accounts changed as
none were selected" message. This commit changes them to read "tags",
"posts", "emojis", etc. where necessary.
2022-10-15 00:20:54 +02:00
Claire
92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/admin/base_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
  Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `config/navigation.rb`:
  Minor conflict caused by glitch-soc having additional
  navigation items for the theming system while upstream
  slightly changed every line.
2022-07-05 09:33:44 +02:00
Eugen Rochko
44b2ee3485
Add customizable user roles ()
* Add customizable user roles

* Various fixes and improvements

* Add migration for old settings and fix tootctl role management
2022-07-05 02:41:40 +02:00
Claire
80c4db160e
Fix blank screen when trying to copy emoji with a too large file size ()
Fixes 
2022-03-14 17:34:53 +01:00
ThibG
bf6745b9c3
Fix unpermitted operations on custom emojis leading to cryptic errors ()
* Display appropriate error when performing unpermitted operation on custom emoji

Fixes 

* Remove links to custom emoji actions not performable by moderators
2020-06-05 15:23:27 +02:00
Eugen Rochko
6feafb8802
Various fixes and improvements ()
* 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
Eugen Rochko
49b2f7c0a2
Fix base64-encoded file uploads not being possible ()
Fix , Fix 
2020-01-04 01:54:07 +01:00
Eugen Rochko
1110ea1a91
Add batch actions and categories to admin UI for custom emojis () 2019-09-09 22:44:17 +02:00
Hinaloe
d7ad42a888 Randomize emoji filename () 2019-02-22 16:52:04 +01:00
beatrix
a56c4742d3 keep the same filters and page when doing custom emojo stuff (fixes ) () 2017-12-30 02:43:43 +01:00
Eugen Rochko
ad75ec8b5b
Add filters to admin UI for custom emojis () 2017-12-13 13:28:31 +01:00
Eugen Rochko
e84fecb7e9
Add logging of admin actions ()
* Add logging of admin actions

* Update brakeman whitelist

* Log creates, updates and destroys with history of changes

* i18n: Update Polish translation ()

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* Split admin navigation into moderation and administration

* Redesign audit log page

* 🇵🇱 ()

* Add color coding to audit log

* Change dismiss->resolve, log all outcomes of report as resolve

* Update terminology (e-mail blacklist) ()

* Update terminology (e-mail blacklist)

imho looks better

* Update en.yml

* Fix code style issues

* i18n-tasks normalize
2017-11-24 02:05:53 +01:00
Clworld
e1ebf36352 Fix regression : fixes emoji copy () 2017-11-17 18:22:31 +01:00
Eugen Rochko
7bb8b0b2fc
Add moderator role and add pundit policies for admin actions ()
* Add moderator role and add pundit policies for admin actions

* Add rake task for turning user into mod and revoking it again

* Fix handling of unauthorized exception

* Deliver new report e-mails to staff, not just admins

* Add promote/demote to admin UI, hide some actions conditionally

* Fix unused i18n
2017-11-11 20:23:33 +01:00
nullkal
b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis ()
* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy
2017-11-07 14:49:32 +01:00
nullkal
781105293c Feature: Unlisted custom emojis () 2017-10-27 16:11:30 +02:00
erin
22da775a85 Fix copying emojos: redirect to the page you were on () 2017-10-26 23:44:24 +09:00
KY
1bdd694a0a Fix - Redirection with page params after copy emoji ()
* Fix  - Redirection with page params after copy emoji

* Add page params to copy emoji link
2017-10-14 14:40:10 +02:00
Eugen Rochko
61d3ecc805 Fix custom emoji copy not copying file () 2017-10-10 15:18:27 +02:00
Eugen Rochko
49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable () 2017-10-05 23:42:05 +02:00
Eugen Rochko
293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis () 2017-09-23 01:57:23 +02:00
Yamagishi Kazutoshi
1664e52cbb Fix custom emojis index () 2017-09-19 05:06:13 +02:00
Eugen Rochko
09a94b575e Admin interface for listing, adding and removing custom emojis ()
* Admin interface for listing, adding and removing custom emojis

* Only display local ones in the list
2017-09-19 03:52:38 +02:00