Source code for the custom Mastodon (Glitchsoc) instance on berserker.town. https://berserker.town/

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tag: Branch: Tree: 85722a918d

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '85722a918d'

${ noResults }

microblog/app/javascript/mastodon/features

History

Claire 85722a918d Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.		12 months ago
..
about	Enforce import order with ESLint (#25096)	1 year ago
account	Change share action from being in action bar to being in dropdown in web UI (#25105)	1 year ago
account_gallery	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
account_timeline	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
audio	Enforce import order with ESLint (#25096)	1 year ago
blocks	Enforce import order with ESLint (#25096)	1 year ago
bookmarked_statuses	Enforce import order with ESLint (#25096)	1 year ago
closed_registrations_modal	Enforce import order with ESLint (#25096)	1 year ago
community_timeline	Enforce import order with ESLint (#25096)	1 year ago
compose	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
direct_timeline	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
directory	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
domain_blocks	Enforce import order with ESLint (#25096)	1 year ago
emoji	Enforce import order with ESLint (#25096)	1 year ago
explore	Enforce import order with ESLint (#25096)	1 year ago
favourited_statuses	Enforce import order with ESLint (#25096)	1 year ago
favourites	Enforce import order with ESLint (#25096)	1 year ago
filters	Enforce import order with ESLint (#25096)	1 year ago
follow_requests	Enforce import order with ESLint (#25096)	1 year ago
followed_tags	Enforce import order with ESLint (#25096)	1 year ago
followers	Enforce import order with ESLint (#25096)	1 year ago
following	Enforce import order with ESLint (#25096)	1 year ago
getting_started	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
hashtag_timeline	Enforce import order with ESLint (#25096)	1 year ago
home_timeline	Enforce import order with ESLint (#25096)	1 year ago
interaction_modal	Fix `null` signUp URL in various places (#25190)	1 year ago
keyboard_shortcuts	Enforce import order with ESLint (#25096)	1 year ago
list_adder	Enforce import order with ESLint (#25096)	1 year ago
list_editor	Enforce import order with ESLint (#25096)	1 year ago
list_timeline	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
lists	Enforce import order with ESLint (#25096)	1 year ago
mutes	Enforce import order with ESLint (#25096)	1 year ago
notifications	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
onboarding	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	12 months ago
picture_in_picture	Rewrite actions/modal and reducers/modal with typescript (#24833)	1 year ago
pinned_statuses	Enforce import order with ESLint (#25096)	1 year ago
privacy_policy	Enforce import order with ESLint (#25096)	1 year ago
public_timeline	Enforce import order with ESLint (#25096)	1 year ago
reblogs	Enforce import order with ESLint (#25096)	1 year ago
report	Update inconsistent `defaultMessage` (#25114)	1 year ago
standalone/compose	Enforce import order with ESLint (#25096)	1 year ago
status	Handle Surrogate Pairs in truncate() (#25148)	1 year ago
subscribed_languages_modal	Enforce import order with ESLint (#25096)	1 year ago
ui	Fix `null` signUp URL in various places (#25190)	1 year ago
video	Enforce import order with ESLint (#25096)	1 year ago