glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	43dbc62568	Fix privacy dropdown in boost modal on mobile (#1967 ) Fixes #1965	2 years ago
Claire	bdc61d467d	Merge pull request #1966 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Claire	ff42233aae	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
BtbN	f343ed42ff	Add missing procps package to Dockerfile (#21028 ) The new Debian-Base does not come with this by default, making the ps based health-check in the compose file fail	2 years ago
Claire	51a33ce77a	Fix not being able to follow more than one hashtag (#21285 ) Fixes regression from #20860	2 years ago
David Leadbeater	69378eac99	Don't allow URLs that contain non-normalized paths to be verified (#20999 ) * Don't allow URLs that contain non-normalized paths to be verified This stops things like https://example.com/otheruser/../realuser where "/otheruser" appears to be the verified URL, but the actual URL being verified is "/realuser" due to the "/../". Also fix a test to use 'https', so it is testing the right thing, now that since #20304 https is required. * missing do	2 years ago
Claire	e0e7a09cfe	Merge pull request #1955 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Claire	597a783742	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	48e136605a	Fix form-action CSP directive for external login (#20962 )	2 years ago
Claire	f233b5ed25	Merge pull request #1954 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Claire	367db8222f	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	4ae97a2e4c	Fix OAuth flow being broken by recent CSP change (#20958 )	2 years ago
Effy Elden	231e3ec552	Remove blank line from start of Dockerfile breaking syntax declaration (#20948 )	2 years ago
Eugen Rochko	0a78631e86	New Crowdin updates (#20759 ) * New translations en.json (German) * New translations en.json (Italian) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (German) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations en.json (Dutch) * New translations en.json (Esperanto) * New translations en.json (Dutch) * New translations en.yml (Portuguese, Brazilian) * New translations en.json (Faroese) * New translations en.json (Esperanto) * New translations en.json (Irish) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.json (Scots) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.json (Scots) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations en.yml (Esperanto) * New translations en.yml (Chinese Simplified) * New translations en.yml (Chinese Simplified) * New translations en.json (Chinese Simplified) * New translations simple_form.en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Chinese Simplified) * New translations en.json (Lithuanian) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Galician) * New translations en.json (Icelandic) * New translations en.yml (Thai) * New translations en.yml (Slovenian) * New translations en.yml (Lithuanian) * New translations en.yml (Macedonian) * New translations en.yml (Dutch) * New translations en.yml (Punjabi) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Russian) * New translations en.yml (Slovak) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Georgian) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Urdu (Pakistan)) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Persian) * New translations en.yml (Tamil) * New translations en.yml (Korean) * New translations en.yml (Japanese) * New translations en.yml (German) * New translations en.yml (Arabic) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Ido) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (Afrikaans) * New translations en.yml (Bulgarian) * New translations en.yml (Italian) * New translations en.yml (Catalan) * New translations en.yml (Danish) * New translations en.yml (Frisian) * New translations en.yml (Basque) * New translations en.yml (Finnish) * New translations en.yml (Hebrew) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Silesian) * 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 (Sardinian) * New translations en.yml (Sanskrit) * New translations en.yml (Taigi) * New translations en.yml (Standard Moroccan Tamazight) * New translations en.yml (Asturian) * New translations en.yml (Burmese) * New translations en.yml (Igbo) * New translations en.yml (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Occitan) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Bengali) * New translations en.yml (Telugu) * New translations en.yml (Marathi) * New translations en.yml (Croatian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Hindi) * New translations en.yml (English, United Kingdom) * New translations en.yml (Kannada) * New translations en.yml (Welsh) * New translations en.yml (Uyghur) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Tatar) * New translations en.yml (Malayalam) * New translations en.yml (Sinhala) * New translations en.yml (Cornish) * New translations en.yml (Thai) * New translations en.yml (Portuguese) * New translations en.yml (Georgian) * New translations en.yml (Korean) * New translations en.yml (Lithuanian) * New translations en.yml (Dutch) * New translations simple_form.en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Russian) * New translations en.yml (Italian) * New translations en.yml (Slovak) * New translations en.yml (Slovenian) * New translations en.yml (Serbian (Cyrillic)) * New translations en.yml (Swedish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Vietnamese) * New translations en.yml (Galician) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Japanese) * New translations en.yml (Armenian) * New translations en.json (Hebrew) * New translations en.yml (French) * New translations en.yml (German) * New translations en.yml (Czech) * New translations en.yml (Chinese Simplified) * New translations en.yml (Spanish) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Czech) * New translations en.yml (Albanian) * New translations en.yml (Ukrainian) * New translations en.yml (Afrikaans) * 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 (Basque) * New translations en.yml (Finnish) * New translations en.yml (Irish) * New translations en.yml (Hebrew) * New translations en.yml (Indonesian) * New translations en.yml (Ido) * New translations en.yml (Persian) * New translations simple_form.en.yml (Polish) * New translations en.yml (Breton) * New translations en.yml (Sinhala) * New translations en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Sinhala) * New translations simple_form.en.yml (Vietnamese) * New translations simple_form.en.yml (Romanian) * New translations simple_form.en.yml (French) * New translations simple_form.en.yml (Spanish) * New translations simple_form.en.yml (Afrikaans) * New translations simple_form.en.yml (Arabic) * New translations simple_form.en.yml (Bulgarian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Esperanto) * New translations en.yml (Welsh) * New translations en.yml (Malay) * New translations en.yml (Corsican) * New translations en.yml (Occitan) * New translations en.yml (Sardinian) * New translations en.yml (Serbian (Latin)) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.yml (Kabyle) * New translations en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Bengali) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (Icelandic) * New translations simple_form.en.yml (Portuguese, Brazilian) * New translations simple_form.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Ukrainian) * New translations simple_form.en.yml (Croatian) * New translations simple_form.en.yml (Norwegian Nynorsk) * New translations simple_form.en.yml (Kazakh) * New translations simple_form.en.yml (Estonian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Chinese Traditional) * New translations simple_form.en.yml (Turkish) * New translations simple_form.en.yml (Georgian) * New translations simple_form.en.yml (Frisian) * New translations simple_form.en.yml (Basque) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Armenian) * New translations simple_form.en.yml (Italian) * New translations simple_form.en.yml (Japanese) * New translations simple_form.en.yml (Swedish) * New translations simple_form.en.yml (Portuguese) * New translations simple_form.en.yml (Slovak) * New translations simple_form.en.yml (Slovenian) * New translations simple_form.en.yml (Albanian) * New translations simple_form.en.yml (Serbian (Cyrillic)) * New translations en.yml (French, Quebec) * New translations en.json (Faroese) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Malayalam) * New translations simple_form.en.yml (Tatar) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Ido) * New translations simple_form.en.yml (Sardinian) * New translations simple_form.en.yml (Corsican) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Occitan) * New translations simple_form.en.yml (Asturian) * New translations en.yml (Chinese Simplified) * New translations en.yml (Hebrew) * New translations en.yml (Korean) * New translations en.yml (Dutch) * New translations en.yml (Slovenian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Kurmanji (Kurdish)) * normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
Claire	381137c94e	Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Claire	c22f3a87a3	[Glitch] Remove use of DOMParser in front-end emoji rewriting code Port `585cc1a604` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Levi Bard	4b449fff23	[Glitch] Make the button that expands the publish form differentiable from the button that publishes a post Port `654d348aac` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
nyura123dev	87929ad866	[Glitch] Fix safari explore disappearing tabs Port `aaca78da78` to glitch-soc Co-authored-by: nyura <nyura@hidden.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Moritz Heiber	1b5ed32085	Split off Dockerfile components for faster build times (#20933 )	2 years ago
Claire	5ef92dff57	Remove glitch-soc-specific translations of upstreamed feature (domain block import)	2 years ago
Claire	aec61a703f	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.	2 years ago
Claire	ab7d99e035	Fix various issues with domain block import (#1944 ) - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded	2 years ago
Claire	585cc1a604	Remove use of DOMParser in front-end emoji rewriting code (#20758 ) * Add jstest for node ordering in emojify * Remove use of DOMParser in front-end emoji rewriting code	2 years ago
Rose	4f15fd0ba1	Fix style for hashes (#20518 ) * Fix style for hashes Make the style for hashes consistent. * New style More consistency	2 years ago
lenore gilbert	c373148b3d	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597 ) * Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit `94e98864e3`) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commit `b91196f4b7`) * Fix authorization check in domain blocks controller (cherry picked from commit `7527937758`) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit `9094c2f52c`) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit `26ff48ee48`) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Ell Bradshaw	e7deea62d1	Remove last references to "silencing" in UI text (#20637 ) * Remove last references to "silencing" in en and en_GB locales * Remove stray the, rephrase a bit * Revert changes to generated files I assume these will get updated via Crowdin	2 years ago
Kohei Ota (inductor)	92734e3df1	Use buildx functions for faster build (#20692 ) * Use buildx functions for faster build * move link * cannot use --link with --chown	2 years ago
Joshua Wood	daf6f3453e	Handle links with no href in VerifyLinkService (#20741 ) Before this change, the following error would cause VerifyAccountLinksWorker to fail: NoMethodError: undefined method `downcase' for nil:NilClass [PROJECT_ROOT]/app/services/verify_link_service.rb:31 :in `block in link_back_present?`	2 years ago
Claire	cbb0153bd0	Fix invalid/empty RSS feed link on account pages (#20772 ) Fixes #20770	2 years ago
trwnh	7fdeed5fbc	Make tag following idempotent (#20860 )	2 years ago
trwnh	72618ebf03	Fix getting a single EmailDomainBlock (#20846 )	2 years ago
Claire	00b2720ef0	Change automatic post deletion configuration to be accessible to redirected users (#20774 ) Fixes #20550	2 years ago
Claire	7955d4b959	Add form-action CSP directive (#20781 )	2 years ago
Claire	eb80789b0b	Fix misleading wording about waitlists (#20850 )	2 years ago
trwnh	e1f819fd78	Fix pagination of followed tags (#20861 ) * Fix missing pagination headers on followed tags * Fix typo	2 years ago
Levi Bard	654d348aac	Make the button that expands the publish form differentiable from the button that publishes a post (#20864 )	2 years ago
Alex Nordlund	642870c82b	Bump Helm chart version to account for mastodon 4 (#20886 )	2 years ago
Claire	0cc77263fc	Change batch account suspension to create a strike (#20897 )	2 years ago
Chris Johnson	413481f953	Add maskable icon support for Android (#20904 ) * Add maskable icon support for Android * Update manifest_serializer.rb * Fix linting issue	2 years ago
trwnh	a2931d19ae	Add missing admin scopes (fix #20892 ) (#20918 )	2 years ago
nyura123dev	aaca78da78	Fix safari explore disappearing tabs (#20917 ) * fix disappearing Explore tabs on Safari * fix lint Co-authored-by: nyura <nyura@hidden.com>	2 years ago
Claire	23ea0e7508	Add aria-label and title attributes to local settings navigation items (#1949 )	2 years ago
Claire	8c56441b4a	Add form-action CSP directive (#1948 )	2 years ago
Effy Elden	f890fdca41	Bump Helm app version to 4.0.2 (#20697 ) * Bump Helm app version to 4.0.1 * Bump Helm app version to 4.0.1	2 years ago
Claire	ad84fd25f1	Merge pull request #1941 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Effy Elden	7efe2cf00f	Modify image build workflow for Glitch workflows (#1942 )	2 years ago
Claire	1901829f9a	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.	2 years ago
Daniel Axtens	4d85c27d1a	Add 'private' to Cache-Control, match Rails expectations (#20608 ) Several controlers set quite intricate Cache-Control headers in order to hopefully not be cached by any intermediate proxies or local caches. Unfortunately, these headers are processed by ActionDispatch::HTTP::Cache in a way that squashes and discards any values set alongside no-store other than private: `8015c2c2cf/actionpack/lib/action_dispatch/http/cache.rb (L207-L209)` We want to preserve no-store on these responses, but we might as well remove parts that are going to be dropped anyway. As many of the endpoints in these controllers are private to a particular user, we should also add "private", which will be preserved alongside no-store.	2 years ago
dependabot[bot]	ac7a29f068	Bump loader-utils from 1.4.1 to 1.4.2 (#20826 ) Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... 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>	2 years ago
dependabot[bot]	f7d261cac7	Bump sidekiq from 6.5.7 to 6.5.8 (#20035 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.7 to 6.5.8. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v6.5.7...v6.5.8) --- updated-dependencies: - dependency-name: sidekiq 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>	2 years ago

1 2 3 4 5 ...

16472 Commits (43dbc6256854a9832c7255fc62a8fa8df7244dd6) All Branches Search

16472 Commits (43dbc6256854a9832c7255fc62a8fa8df7244dd6)

All Branches