mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-29 10:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/settings
History
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
2024-10-06 16:07:58 +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 copyable_input helper method to wrap shared options (#32119) 2024-10-02 14:45:54 +00:00