djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 16:44:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
1ae5f84774
tootlab-mastodon/app/views/settings
History
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-19 19:13:32 +02:00
..
aliases Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
applications Clean up labels on development application form (#32116) 2024-10-02 14:45:12 +00:00
deletes Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
exports Fix recently-broken admin interface buttons (#32240) 2024-10-03 16:12:15 +00:00
featured_tags Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
flavours Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
imports Pluralize csv imports (#27094) 2024-10-04 08:19:01 +00:00
login_activities Replace more font-awesome icons in views/settings (#30963) 2024-08-07 22:52:35 +00:00
migration/redirects Fix LineLength haml-lint in app/views/settings area (#28663) 2024-01-09 15:28:56 +00:00
migrations Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
preferences Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
privacy Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
profiles Extract constants for header and avatar geometry (#32151) 2024-10-01 11:36:25 +00:00
shared Avoid id duplication conflict with main navigation from settings profile link (#32181) 2024-10-01 08:23:05 +00:00
two_factor_authentication Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
two_factor_authentication_methods Fix recently-broken admin interface buttons (#32240) 2024-10-03 16:12:15 +00:00
verifications Add more explicit explanations about author attribution and fediverse:creator (#32383) 2024-10-17 09:03:08 +00:00