mastodon

Commit Graph

Author	SHA1	Message	Date
Claire	7e62688a0e	Fix notification cleaning mode causing notifications to get stuck (#1868 )	2022-10-13 20:00:20 +02:00
Eugen Rochko	8a9d774a84	New Crowdin updates (#19344 ) * New translations simple_form.en.yml (Norwegian) * New translations activerecord.en.yml (Korean) * New translations devise.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations devise.en.yml (Dutch) * New translations doorkeeper.en.yml (Dutch) * New translations activerecord.en.yml (Norwegian) * New translations devise.en.yml (Norwegian) * New translations doorkeeper.en.yml (Norwegian) * New translations activerecord.en.yml (Slovenian) * New translations devise.en.yml (Slovenian) * New translations devise.en.yml (Galician) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations activerecord.en.yml (Vietnamese) * New translations devise.en.yml (Vietnamese) * New translations doorkeeper.en.yml (Vietnamese) * New translations doorkeeper.en.yml (Galician) * New translations activerecord.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations doorkeeper.en.yml (Slovenian) * New translations devise.en.yml (Swedish) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations devise.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations activerecord.en.yml (Swedish) * New translations doorkeeper.en.yml (Swedish) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations devise.en.yml (Chinese Simplified) * New translations devise.en.yml (Indonesian) * New translations doorkeeper.en.yml (Indonesian) * New translations simple_form.en.yml (Kazakh) * New translations doorkeeper.en.yml (Thai) * New translations simple_form.en.yml (Croatian) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations doorkeeper.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations devise.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Thai) * New translations devise.en.yml (Kazakh) * New translations doorkeeper.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations doorkeeper.en.yml (Latvian) * New translations devise.en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Persian) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations doorkeeper.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Argentina) * New translations devise.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Marathi) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations activerecord.en.yml (Bengali) * New translations devise.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations activerecord.en.yml (Hindi) * New translations devise.en.yml (Malayalam) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations doorkeeper.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations activerecord.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations devise.en.yml (Breton) * New translations doorkeeper.en.yml (Breton) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Hindi) * New translations doorkeeper.en.yml (Hindi) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations doorkeeper.en.yml (Corsican) * New translations simple_form.en.yml (Sardinian) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations doorkeeper.en.yml (Sardinian) * New translations devise.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Kabyle) * New translations activerecord.en.yml (Kabyle) * New translations devise.en.yml (Kabyle) * New translations doorkeeper.en.yml (Kabyle) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations devise.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Occitan) * New translations devise.en.yml (Kannada) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations activerecord.en.yml (Asturian) * New translations devise.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations activerecord.en.yml (Occitan) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations devise.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Hungarian) * New translations en.yml (Arabic) * New translations en.yml (Bulgarian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Greek) * New translations en.yml (French) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Romanian) * New translations en.yml (Spanish) * New translations en.yml (Albanian) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Ido) * New translations en.yml (Chinese Simplified) * New translations en.yml (Thai) * New translations en.yml (Swedish) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Slovenian) * New translations en.yml (Armenian) * New translations en.yml (Russian) * New translations en.yml (Portuguese) * New translations en.yml (Polish) * New translations en.yml (Slovak) * New translations en.yml (Norwegian) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.yml (Lithuanian) * New translations en.yml (Dutch) * New translations en.yml (Indonesian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Icelandic) * New translations en.yml (Galician) * New translations en.yml (Vietnamese) * New translations en.yml (Chinese Traditional) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Malayalam) * New translations en.yml (Welsh) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Breton) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Asturian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Croatian) * New translations en.yml (Telugu) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Hindi) * New translations en.yml (Malay) * New translations en.yml (Sardinian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations en.yml (Kabyle) * New translations en.yml (Taigi) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Occitan) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-10-13 23:14:11 +09:00
Eugen Rochko	1bd00036c2	Change about page to be mounted in the web UI (#19345 )	2022-10-13 14:42:37 +02:00
Eugen Rochko	b04633a961	Add image processing and generate blurhash for server thumbnail (#19348 ) Remove separate server hero setting	2022-10-13 11:29:19 +02:00
Claire	27a2edcb79	Fix issues with notification cleaning mode when there is a disconnection gap (#1867 )	2022-10-13 08:55:00 +02:00
Yamagishi Kazutoshi	7afc6a630c	Redirect non-logged-in user to owner statuses on single user mode (#19333 )	2022-10-12 21:07:30 +02:00
Claire	2bb443c7d5	Port various forgotten fixes from upstream (#1864 ) * [Glitch] Fix crash when failing to load emoji picker Port `bd3420b139` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Remove duplicate frequently used emojis Port `98146281e1` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Harmon <Harmon758@gmail.com>	2022-10-12 19:03:28 +02:00
dependabot[bot]	5f6c0d63e3	Bump axios from 0.27.2 to 1.1.2 (#19341 ) Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.1.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.1.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-12 06:30:38 +09:00
Claire	18f210aff6	Fix accidentally importing vanilla code in glitch-soc flavor (#1863 )	2022-10-11 19:35:37 +02:00
Claire	b01faa7375	Merge pull request #1862 from ClearlyClaire/glitch-soc/refactor/upstream-discrepancies Refactor glitch-soc front-end to limit discrepancies with upstream	2022-10-11 19:22:48 +02:00
Claire	e1db6cf320	Move flavours/glitch/features/emoji_picker back to flavours/glitch/features/compose/containers/emoji_picker_dropdown_container	2022-10-11 14:17:27 +02:00
dependabot[bot]	de345e70d8	Bump express from 4.18.1 to 4.18.2 (#19340 ) Bumps [express](https://github.com/expressjs/express) from 4.18.1 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.1...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-11 19:46:58 +09:00
dependabot[bot]	7f036be169	Bump eslint-plugin-react from 7.31.8 to 7.31.9 (#19342 ) Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.31.8 to 7.31.9. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.31.8...v7.31.9) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-11 19:46:28 +09:00
dependabot[bot]	d868c1ced5	Bump @babel/preset-env from 7.19.3 to 7.19.4 (#19339 ) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.19.3 to 7.19.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.19.4/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-11 19:46:03 +09:00
dependabot[bot]	adf6fdf0a9	Bump @babel/runtime from 7.19.0 to 7.19.4 (#19343 ) Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.19.0 to 7.19.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.19.4/packages/babel-runtime) --- updated-dependencies: - dependency-name: "@babel/runtime" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-11 19:45:39 +09:00
Claire	b728b25c10	Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji	2022-10-11 12:43:19 +02:00
Claire	b75bf336bd	Move more modules from flavours/glitch/utils to flavours/glitch	2022-10-11 12:25:45 +02:00
Claire	2535ec4fcb	Remove unused `redux_helpers` module	2022-10-11 12:15:29 +02:00
Claire	0f4a4d7527	Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/	2022-10-11 12:15:08 +02:00
Claire	7097a459be	Move flavours/glitch/utils/ready to flavours/glitch/ready	2022-10-11 11:31:11 +02:00
Claire	015e798394	Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/	2022-10-11 11:31:11 +02:00
Claire	d3879c07b1	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
Claire	1be97ce17f	Remove unneeded change in flavours/glitch/api	2022-10-11 11:30:54 +02:00
Claire	c285546052	Move flavours/glitch/util/api to flavours/glitch/api	2022-10-11 11:30:52 +02:00
Claire	64342a87b4	Refactor initial_state to isolate glitch-soc changes	2022-10-11 10:27:14 +02:00
Claire	26b687160b	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
Eugen Rochko	c70bffd89f	New Crowdin updates (#19330 ) * New translations doorkeeper.en.yml (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations activerecord.en.yml (Arabic) * New translations doorkeeper.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations activerecord.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations simple_form.en.yml (Catalan) * New translations activerecord.en.yml (Catalan) * New translations simple_form.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Vietnamese) * New translations activerecord.en.yml (Dutch) * New translations en.yml (Asturian) * New translations en.yml (Sardinian) * New translations en.yml (Occitan) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Corsican) * New translations activerecord.en.yml (Galician) * New translations en.yml (Sanskrit) * New translations en.yml (Kabyle) * New translations en.yml (Taigi) * New translations en.yml (Silesian) * New translations en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Polish) * New translations doorkeeper.en.yml (Czech) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Danish) * New translations activerecord.en.yml (Hebrew) * New translations simple_form.en.yml (Hebrew) * New translations activerecord.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations doorkeeper.en.yml (Basque) * New translations activerecord.en.yml (Basque) * New translations doorkeeper.en.yml (Finnish) * New translations doorkeeper.en.yml (Frisian) * New translations simple_form.en.yml (Frisian) * New translations doorkeeper.en.yml (Greek) * New translations activerecord.en.yml (Greek) * New translations simple_form.en.yml (Greek) * New translations doorkeeper.en.yml (German) * New translations activerecord.en.yml (German) * New translations simple_form.en.yml (German) * New translations doorkeeper.en.yml (Danish) * New translations activerecord.en.yml (Frisian) * New translations activerecord.en.yml (Danish) * New translations doorkeeper.en.yml (Georgian) * New translations simple_form.en.yml (Korean) * New translations activerecord.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations simple_form.en.yml (Georgian) * New translations activerecord.en.yml (Georgian) * New translations simple_form.en.yml (Hungarian) * New translations doorkeeper.en.yml (Japanese) * New translations activerecord.en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations doorkeeper.en.yml (Italian) * New translations activerecord.en.yml (Italian) * New translations simple_form.en.yml (Italian) * New translations doorkeeper.en.yml (Armenian) * New translations activerecord.en.yml (Armenian) * New translations simple_form.en.yml (Armenian) * New translations doorkeeper.en.yml (Hungarian) * New translations activerecord.en.yml (Hungarian) * New translations doorkeeper.en.yml (Hebrew) * New translations doorkeeper.en.yml (Dutch) * New translations simple_form.en.yml (Norwegian) * New translations simple_form.en.yml (Chinese Traditional) * New translations doorkeeper.en.yml (Swedish) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations activerecord.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations activerecord.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Swedish) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Vietnamese) * New translations doorkeeper.en.yml (Vietnamese) * New translations simple_form.en.yml (Galician) * New translations doorkeeper.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations activerecord.en.yml (Swedish) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Norwegian) * New translations activerecord.en.yml (Russian) * New translations doorkeeper.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations doorkeeper.en.yml (Polish) * New translations simple_form.en.yml (Portuguese) * New translations activerecord.en.yml (Portuguese) * New translations doorkeeper.en.yml (Portuguese) * New translations simple_form.en.yml (Russian) * New translations doorkeeper.en.yml (Russian) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Slovak) * New translations activerecord.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations simple_form.en.yml (Slovenian) * New translations activerecord.en.yml (Slovenian) * New translations doorkeeper.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Estonian) * New translations activerecord.en.yml (Croatian) * New translations doorkeeper.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations activerecord.en.yml (Kazakh) * New translations doorkeeper.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations doorkeeper.en.yml (Thai) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations doorkeeper.en.yml (Latvian) * New translations activerecord.en.yml (Hindi) * New translations doorkeeper.en.yml (Hindi) * New translations simple_form.en.yml (Croatian) * New translations activerecord.en.yml (Thai) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Spanish, Argentina) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * New translations activerecord.en.yml (Indonesian) * New translations doorkeeper.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations activerecord.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations activerecord.en.yml (Tamil) * New translations doorkeeper.en.yml (Tamil) * New translations activerecord.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Thai) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations activerecord.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations doorkeeper.en.yml (Marathi) * New translations activerecord.en.yml (Asturian) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations doorkeeper.en.yml (Sinhala) * New translations simple_form.en.yml (Occitan) * New translations activerecord.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sinhala) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Breton) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations doorkeeper.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations activerecord.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations doorkeeper.en.yml (Kabyle) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Kabyle) * New translations simple_form.en.yml (Kabyle) * New translations doorkeeper.en.yml (Sardinian) * New translations activerecord.en.yml (Sardinian) * New translations simple_form.en.yml (Sardinian) * New translations doorkeeper.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.json (Japanese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations activerecord.en.yml (Japanese) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Spanish, Argentina) * New translations en.json (Turkish) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.json (Vietnamese) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Polish) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Ukrainian) * New translations en.json (Czech) * New translations simple_form.en.yml (Czech) * New translations en.json (Albanian) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations en.json (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Ukrainian) * New translations en.json (Portuguese) * New translations en.json (Vietnamese) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Ukrainian) * New translations en.json (Vietnamese) * New translations simple_form.en.yml (Danish) * New translations en.json (Japanese) * New translations en.json (Hungarian) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Italian) * New translations en.json (German) * New translations en.json (German) * New translations en.json (Spanish) * New translations simple_form.en.yml (Spanish) * New translations en.json (Galician) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-10-11 12:59:29 +09:00
Yamagishi Kazutoshi	d787343325	Hide list panel from nav bar in mobile layout (#19337 )	2022-10-10 21:41:25 +02:00
Yamagishi Kazutoshi	05148e2c77	Fix missing `skip_review?` (#19335 )	2022-10-10 08:03:19 +02:00
Yamagishi Kazutoshi	3eef8a7a81	Fix `ColumnLink` labels not disappearing in mobile UI (#19334 )	2022-10-10 06:51:16 +02:00
Jeremy Kescher	5f79200a5e	Remove/update old "tootsuite" references, except those needed for Docker (#19327 )	2022-10-10 00:33:38 +02:00
Yamagishi Kazutoshi	32c3bd3c53	Use pep440 for Docker image tag rules (#19332 )	2022-10-10 00:32:40 +02:00
Claire	94713940c7	Merge pull request #1861 from ClearlyClaire/glitch-soc/features/logged-out-webui Port logged-out Web UI to glitch-soc	2022-10-09 23:26:02 +02:00
Eugen Rochko	d04fbe6fe0	[Glitch] Change font size of active users in server banner to be larger in web UI Port `0e41d360c0` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 20:45:26 +02:00
trwnh	0d0fac939d	[Glitch] Fix crash in report modal Port `99a43f0282` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 20:31:46 +02:00
Eugen Rochko	757e16a0b5	[Glitch] Add server banner to web app Port `d2528b26b6` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 20:26:15 +02:00
Eugen Rochko	bf3cb42da7	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294 ) Cherry-picked `d2528b26b6` Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.	2022-10-09 19:51:39 +02:00
Yamagishi Kazutoshi	d3f1a010e5	Fix fedi/local timeline nav link always hide (#19329 )	2022-10-09 19:26:14 +02:00
Eugen Rochko	f879c42747	New Crowdin updates (#19317 ) * New translations activerecord.en.yml (Catalan) * New translations devise.en.yml (Catalan) * New translations doorkeeper.en.yml (Catalan) * New translations devise.en.yml (Czech) * New translations doorkeeper.en.yml (Czech) * New translations simple_form.en.yml (Danish) * New translations activerecord.en.yml (Danish) * New translations devise.en.yml (Danish) * New translations simple_form.en.yml (German) * New translations doorkeeper.en.yml (Frisian) * New translations activerecord.en.yml (German) * New translations devise.en.yml (German) * New translations doorkeeper.en.yml (German) * New translations simple_form.en.yml (Greek) * New translations activerecord.en.yml (Greek) * New translations devise.en.yml (Greek) * New translations doorkeeper.en.yml (Greek) * New translations simple_form.en.yml (Frisian) * New translations activerecord.en.yml (Frisian) * New translations devise.en.yml (Frisian) * New translations simple_form.en.yml (Italian) * New translations activerecord.en.yml (Italian) * New translations devise.en.yml (Italian) * New translations doorkeeper.en.yml (Italian) * New translations activerecord.en.yml (Portuguese) * New translations doorkeeper.en.yml (Norwegian) * New translations activerecord.en.yml (Polish) * New translations devise.en.yml (Polish) * New translations doorkeeper.en.yml (Polish) * New translations simple_form.en.yml (Portuguese) * New translations devise.en.yml (Portuguese) * New translations simple_form.en.yml (Slovenian) * New translations devise.en.yml (Norwegian) * New translations simple_form.en.yml (Russian) * New translations activerecord.en.yml (Russian) * New translations devise.en.yml (Russian) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Slovak) * New translations activerecord.en.yml (Slovak) * New translations devise.en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations doorkeeper.en.yml (Portuguese) * New translations simple_form.en.yml (Norwegian) * New translations activerecord.en.yml (Norwegian) * New translations devise.en.yml (Korean) * New translations activerecord.en.yml (Japanese) * New translations devise.en.yml (Japanese) * New translations doorkeeper.en.yml (Japanese) * New translations simple_form.en.yml (Georgian) * New translations activerecord.en.yml (Georgian) * New translations devise.en.yml (Georgian) * New translations doorkeeper.en.yml (Georgian) * New translations simple_form.en.yml (Korean) * New translations activerecord.en.yml (Korean) * New translations doorkeeper.en.yml (Korean) * New translations doorkeeper.en.yml (Dutch) * New translations devise.en.yml (Dutch) * New translations activerecord.en.yml (Slovenian) * New translations devise.en.yml (Slovenian) * New translations devise.en.yml (Galician) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations devise.en.yml (Urdu (Pakistan)) * New translations activerecord.en.yml (Vietnamese) * New translations devise.en.yml (Vietnamese) * New translations doorkeeper.en.yml (Vietnamese) * New translations simple_form.en.yml (Galician) * New translations doorkeeper.en.yml (Galician) * New translations activerecord.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations doorkeeper.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations activerecord.en.yml (Portuguese, Brazilian) * New translations devise.en.yml (Portuguese, Brazilian) * New translations doorkeeper.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * New translations activerecord.en.yml (Indonesian) * New translations devise.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations doorkeeper.en.yml (Slovenian) * New translations devise.en.yml (Swedish) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations activerecord.en.yml (Serbian (Cyrillic)) * New translations devise.en.yml (Serbian (Cyrillic)) * New translations doorkeeper.en.yml (Serbian (Cyrillic)) * New translations simple_form.en.yml (Swedish) * New translations activerecord.en.yml (Swedish) * New translations doorkeeper.en.yml (Swedish) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Turkish) * New translations devise.en.yml (Turkish) * New translations doorkeeper.en.yml (Turkish) * New translations simple_form.en.yml (Ukrainian) * New translations activerecord.en.yml (Ukrainian) * New translations devise.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Ukrainian) * New translations activerecord.en.yml (Chinese Simplified) * New translations devise.en.yml (Chinese Simplified) * New translations devise.en.yml (Indonesian) * New translations doorkeeper.en.yml (Indonesian) * New translations simple_form.en.yml (Kazakh) * New translations doorkeeper.en.yml (Thai) * New translations simple_form.en.yml (Croatian) * New translations activerecord.en.yml (Croatian) * New translations devise.en.yml (Croatian) * New translations doorkeeper.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Norwegian Nynorsk) * New translations devise.en.yml (Norwegian Nynorsk) * New translations doorkeeper.en.yml (Norwegian Nynorsk) * New translations activerecord.en.yml (Kazakh) * New translations activerecord.en.yml (Thai) * New translations devise.en.yml (Kazakh) * New translations doorkeeper.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations activerecord.en.yml (Estonian) * New translations devise.en.yml (Estonian) * New translations doorkeeper.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations devise.en.yml (Latvian) * New translations doorkeeper.en.yml (Latvian) * New translations devise.en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations simple_form.en.yml (Persian) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Persian) * New translations devise.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations activerecord.en.yml (Tamil) * New translations devise.en.yml (Tamil) * New translations doorkeeper.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Argentina) * New translations devise.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Marathi) * New translations activerecord.en.yml (Spanish, Mexico) * New translations devise.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations activerecord.en.yml (Bengali) * New translations devise.en.yml (Bengali) * New translations activerecord.en.yml (Marathi) * New translations activerecord.en.yml (Hindi) * New translations devise.en.yml (Malayalam) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Chinese Traditional, Hong Kong) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations devise.en.yml (Tatar) * New translations doorkeeper.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations activerecord.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations devise.en.yml (Breton) * New translations doorkeeper.en.yml (Breton) * New translations activerecord.en.yml (Sinhala) * New translations devise.en.yml (Sinhala) * New translations doorkeeper.en.yml (Sinhala) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations devise.en.yml (Hindi) * New translations doorkeeper.en.yml (Hindi) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations devise.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations simple_form.en.yml (Esperanto) * New translations activerecord.en.yml (Esperanto) * New translations devise.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations devise.en.yml (Corsican) * New translations doorkeeper.en.yml (Corsican) * New translations simple_form.en.yml (Sardinian) * New translations activerecord.en.yml (Sardinian) * New translations devise.en.yml (Sardinian) * New translations doorkeeper.en.yml (Sardinian) * New translations devise.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Kabyle) * New translations activerecord.en.yml (Kabyle) * New translations devise.en.yml (Kabyle) * New translations doorkeeper.en.yml (Kabyle) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations devise.en.yml (Ido) * New translations doorkeeper.en.yml (Ido) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Occitan) * New translations devise.en.yml (Kannada) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations devise.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Asturian) * New translations devise.en.yml (Asturian) * New translations activerecord.en.yml (Occitan) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations devise.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations devise.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations devise.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations devise.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.yml (German) * New translations en.json (German) * New translations en.json (Kurmanji (Kurdish)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Ukrainian) * New translations en.json (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.json (Dutch) * New translations en.yml (Dutch) * New translations en.json (Danish) * New translations en.yml (Danish) * New translations en.json (Danish) * New translations en.json (Vietnamese) * New translations en.yml (Turkish) * New translations en.json (Turkish) * New translations en.json (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Spanish) * New translations en.json (Spanish) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-10-10 01:27:03 +09:00
Eugen Rochko	c9fadb3cae	[Glitch] Add interaction modal to logged-out web UI Port `7fb738c837` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	90c6b0aed6	[Glitch] Fix trying to connect to streaming API when logged out in web UI Port `d4b0aa7450` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	60e2cdd81a	[Glitch] Fix various issues with logged-out web UI Port part of `e2b561e3a5` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Yamagishi Kazutoshi	f4fe985a03	[Glitch] Fix missing await Port `fc3d248df7` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Yamagishi Kazutoshi	cc93cd5d6c	[Glitch] Disable push notification when not logged in Port `216dbaedaf` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	d86cb4cab8	[Glitch] Allow non-logged users to access /web Port `43b5d5e38d` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	9ee2746a36	[Glitch] Add dynamic document title to WebUI Port part of `43b5d5e38d` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	1ddd2186de	[Glitch] Add sign-up button to logged-out web UI Port `e623c302d5` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	b38361a347	[Glitch] Fix various issues with logged-out Web UI Port fixes from `e623c302d5` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-09 18:23:15 +02:00
Eugen Rochko	0765324622	Fix intermediary responsive layout, accessibility on navigation in web UI (#19324 ) * Fix intermediary responsive layout, accessibility on navigation in web UI * `yarn test:jest -u` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2022-10-09 15:55:32 +02:00
Claire	3f0505ea15	Fix logged-out UI not using single-column interface	2022-10-09 15:29:14 +02:00

... 3 4 5 6 7 ...

16144 Commits (10c928a72e37b51711430bd4c3fd3bb4e3267b80) All Branches Search

16144 Commits (10c928a72e37b51711430bd4c3fd3bb4e3267b80)

All Branches