Age | Commit message (Collapse) | Author |
|
Port 585cc1a604f6c445436b5bea23c1eb2f899300c3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
the button that publishes a post
Port 654d348aac804b3f5f96f21399118f625121501f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port aaca78da78909dd5a23df3e70de07b838eaf4a0e to glitch-soc
Co-authored-by: nyura <nyura@hidden.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|
|
* Add jstest for node ordering in emojify
* Remove use of DOMParser in front-end emoji rewriting code
|
|
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 94e98864e39c010635e839fea984f2b4893bef1a)
* 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 b91196f4b73fff91997b8077619ae25b6d04a59e)
* Fix authorization check in domain blocks controller
(cherry picked from commit 75279377583c6e2aa04cc8d7380c593979630b38)
* 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 9094c2f52c24e1c00b594e7c11cd00e4a07eb431)
* Fix domain block export not exporting blocks with only media rejection
(cherry picked from commit 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960)
* 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>
|
|
that publishes a post (#20864)
|
|
* fix disappearing Explore tabs on Safari
* fix lint
Co-authored-by: nyura <nyura@hidden.com>
|
|
|
|
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.
|
|
* New translations en.json (Catalan)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Ukrainian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Hungarian)
* New translations en.json (Slovak)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Irish)
* New translations en.yml (Norwegian)
* New translations en.yml (German)
* New translations en.json (Romanian)
* New translations en.yml (Danish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.yml (Danish)
* New translations en.json (Catalan)
* New translations en.yml (Norwegian)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Norwegian)
* New translations en.json (Catalan)
* New translations en.json (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Latvian)
* New translations en.json (Irish)
* New translations en.json (Swedish)
* New translations en.yml (Galician)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Kabyle)
* New translations en.yml (Welsh)
* New translations en.json (Breton)
* New translations en.json (Kabyle)
* New translations en.yml (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations en.json (Malay)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Malay)
* New translations activerecord.en.yml (Malay)
* New translations devise.en.yml (Malay)
* New translations doorkeeper.en.yml (Malay)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Malay)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Malay)
* New translations en.yml (Dutch)
* New translations en.json (Malay)
* New translations en.yml (Malay)
* New translations en.json (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Malay)
* New translations devise.en.yml (Welsh)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations devise.en.yml (Malay)
* New translations en.json (Vietnamese)
* New translations en.yml (Malay)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Malay)
* New translations devise.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Norwegian)
* New translations devise.en.yml (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Norwegian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Esperanto)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Norwegian)
* New translations en.json (Welsh)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Norwegian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations en.json (Asturian)
* New translations en.json (Asturian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
Fixes #1930
|
|
Port ccbca50a2502108884f7f3c9ea24df8b2129731d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
* Fix front-end emoji tests
* Fix nodes order being sometimes mangled when rewriting emoji
|
|
Port 625e0869961af9fe1518c5e127d0ee6f8fb6a817 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `Gemfile`:
Upstream removed blank lines.
|
|
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 2d54986a03675dbad940948177037ce2f12d11b9 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
Port b59ce0a60ff4f90bb16a8c3338ad37218af052b8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
screens in web UI
Port 6da9df774ea9973124fe7e2f5a9dd0862a22acd8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e62b514e958ca2bfc08944b2368c6d41417f9e8a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
|
|
* Move V2 Filter methods under /api/v2 prefix
* move over the tests too
|
|
Regression from #20540
|
|
UI (#20620)
|
|
|
|
|
|
* Change in-app links to keep you in-app
* refactor Permalink into Link
* rewrite link hrefs in status content
* please linter
* please linter again
|
|
Fixes #20441
|
|
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations en.json (Japanese)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations en.yml (Norwegian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Latvian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Norwegian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Malayalam)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Thai)
* New translations devise.en.yml (Welsh)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.yml (Irish)
* New translations en.json (Norwegian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Norwegian)
* New translations en.json (Finnish)
* New translations en.json (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations en.yml (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (Greek)
* New translations en.yml (German)
* New translations en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Finnish)
* New translations en.yml (Basque)
* New translations en.yml (Frisian)
* New translations en.yml (Danish)
* New translations en.yml (Catalan)
* New translations en.yml (Bulgarian)
* New translations en.yml (Arabic)
* New translations en.yml (Afrikaans)
* New translations en.yml (French)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations en.yml (Armenian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Swedish)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* 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 (Slovak)
* New translations en.yml (Japanese)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations en.yml (Punjabi)
* New translations en.yml (Norwegian)
* New translations en.yml (Dutch)
* New translations en.yml (Macedonian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Korean)
* New translations en.yml (Georgian)
* New translations en.yml (Italian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Turkish)
* New translations en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sinhala)
* New translations en.yml (Sardinian)
* 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 en.yml (Burmese)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Bengali)
* New translations en.yml (Hindi)
* 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 (Malay)
* New translations en.yml (Malayalam)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Igbo)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Afrikaans)
* New translations en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.yml (German)
* New translations en.yml (Czech)
* New translations en.yml (Catalan)
* New translations en.yml (Greek)
* New translations en.yml (Italian)
* New translations en.yml (Slovenian)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Basque)
* New translations en.yml (Norwegian)
* New translations en.yml (Portuguese)
* New translations en.yml (Icelandic)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (French)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Esperanto)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Hebrew)
* New translations en.yml (Norwegian)
* New translations en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Finnish)
* New translations en.json (Norwegian)
* New translations en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
available
Port 93a6ebc83d4bc6647d1eafce509a29aa3642c87c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
unattached media
Port 31005aad12c6a915a00501765a6dab25878326cb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 553b169d483e9b2f28007e130a494aec08a1720a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 5e796dc6f85b37c8378fe01cfd8ac23222c89eea to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
in web UI
Port 6774c339b2e22fc9cadcb466139745661d0b3c83 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port cf4992c918459187962a9e2f389f9ccb4f1b825d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 53d26cfc1cc2779f699f3d3d56696484faefe87c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
logged out
Port 894ce3726a38733ea7b8c880658b962f92d021ae to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 99734ac9367eb8af705aecca423c998aadddbd59 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
light theme
Port 89a6b76f999635e077e9469efd9d94cd6c6d6222 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
|
|
|
|
ClearlyClaire/glitch-soc/fixes/not-recommended-label
Fix “not recommended” label being shown as “recommended”
|
|
Port SCSS changes from 546672e292dc3218e996048464c4c52e5d00f766 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
include statuses (#17977)""
This reverts commit bfc539cfb4f040fcffac740b36791c26c2a74119.
|
|
Fixes #1914
|