f3bd96c91c
[Glitch] change poll form element colors to fit with the rest of the ui
...
Port 80809ef33e
1 year ago
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
1 year ago
09ebf7e37c
[Glitch] Replace 'favourite' by 'favorite' for American English
...
Port 217ef7f2af
1 year ago
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
1 year ago
5914dfdd69
[Glitch] Change thread view to scroll to the selected post rather than the post being replied to
...
Port e4ea80d808
1 year ago
42f36aa55a
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
1 year ago
f05effeb8f
[Glitch] Fix a missing redirection on getting-started in multi column mode
...
Port 586b1c9dca
1 year ago
d3d6147286
[Glitch] Wrong count in response when removing favourite/reblog
...
Port 4c18928a93
1 year ago
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
1 year ago
3a14104411
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
d4807a5e64
Change aspect ratios on link previews in web UI ( #26250 )
1 year ago
4d3a129212
Fix public TL not indicating new toots when `onlyRemote` is enabled ( #26247 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
1cc3fcf7d0
Fix Public TL not indicating new toots when `onlyRemote` or `allowLocalOnly` is enabled ( #2336 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
feaf3cf780
Fix firehose not indicating new toots in "All" ( #2335 )
...
When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
e69fe94669
Fix "All" live feed not loading automatically. ( #2332 )
...
The dispatch to expand the timeline was missing the `allowLocalOnly` param.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
8864d5b580
New Crowdin translations ( #2327 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
6256cee034
Change error boundary to upstream's ( #2323 )
1 year ago
a4ec187a20
Change the wording of the dismissable explore prompt ( #25917 )
1 year ago
bbea052935
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
1 year ago
b4e739ff0f
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
1e4ccc655a
Add role badges to the WebUI ( #25649 )
1 year ago
b9adea9695
New Crowdin Translations (automated) ( #26072 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
a4b69bec2e
Fix missing GIF badge in account gallery ( #26166 )
1 year ago
6781dc6462
Preserve translation on status re-import ( #26168 )
1 year ago
ce1f35d7e2
Revert poll colors to green outside of compose form ( #26164 )
1 year ago
49d2e8979f
fix poll input active style ( #26162 )
1 year ago
f826a95f6e
Add published date and author to news on the explore screen in web UI ( #26155 )
1 year ago
4299208487
Fix `lang` for UI texts in link preview ( #26149 )
1 year ago
714a20697f
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
1 year ago
d1a9f601c7
Fix missing border on error screen in light theme in web UI ( #26152 )
1 year ago
9a567ec1d1
Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )
1 year ago
76fce34ebb
Add `lang` attribute to trending links ( #26111 )
1 year ago
80809ef33e
change poll form element colors to fit with the rest of the ui ( #26139 )
1 year ago
6b2952d1dd
Change design of link previews in web UI ( #26136 )
1 year ago
4d01d1a1ee
Remove 16:9 cropping from web UI ( #26132 )
1 year ago
cf9affdeac
Apply padding to all notifications in notif-cleaning mode ( #2325 )
...
* Add missing padding to notif-cleaning for admin-sign-up
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Apply padding to all notification types instead
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
5e8cbb5f82
Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )
1 year ago
cfd50f30bb
Fix focus and hover styles in web UI ( #26125 )
1 year ago
51311c1978
Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
944c29033d
Fix relationship-tag background color ( #2322 )
1 year ago
9ec43107f2
New Crowdin translations ( #2319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
49767d20bd
Fix glitch local settings navigation items not being proper buttons ( #2320 )
1 year ago
dd09535bda
Annotate doodle parameters to please eslint ( #2321 )
1 year ago
52500965cc
Fix “Open in advanced web interface” being shown on mobile view ( #2318 )
...
Fixes #2307
1 year ago
9a45198ab0
New Crowdin translations ( #2317 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
1b4cf0eba0
Favourits -> Favorites ( #26109 )
1 year ago
217ef7f2af
Replace 'favourite' by 'favorite' for American English ( #26009 )
1 year ago
59478a1b46
change focus ui for keyboard only input ( #25935 )
1 year ago
e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
1 year ago
e7cb6c6c44
New Crowdin translations ( #2314 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
586b1c9dca
Fix a missing redirection on getting-started in multi column mode ( #26070 )
1 year ago
4c18928a93
Wrong count in response when removing favourite/reblog ( #24365 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
0092fe50ac
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
1 year ago
111686c38b
New Crowdin updates ( #2306 )
...
* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
1 year ago
47832a1ac0
New Crowdin Translations (automated) ( #26054 )
...
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
0c45bed333
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port a442a1d1c6
1 year ago
c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
1 year ago
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
1 year ago
12e7f5fabd
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 97ce47e451
1 year ago
27f7e5b0f3
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port b923a4c755
1 year ago
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
97ce47e451
Fix for "follows you" indicator in light web UI not readable ( #25993 )
1 year ago
23197cebce
Reduce dropdown menu margin and padding ( #2301 )
...
* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency
1 year ago
b923a4c755
Prevent split line between icon and number on reposts & favourites ( #26004 )
1 year ago
c45a965bf7
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 71db616fed
1 year ago
9bd012b7cb
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 5fad7bd58a
1 year ago
0d61985713
Remove layout glitch-soc settings
1 year ago
f0d3267fbf
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port a8edbcf963
1 year ago
a98b5c2246
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 41f65edb21
1 year ago
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
1 year ago
470ded3687
Fix notifications not loading when slow mode active ( #2292 )
...
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in e91bf82083
1 year ago
e271d018b7
Fix home timeline's regexp field
1 year ago
71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
1 year ago
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
1 year ago
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
1 year ago
98e5589ed4
[Glitch] Fix follow link style in embeds
...
Port 5a3f174d56
1 year ago
18f55567b0
[Glitch] Upgrade to `typescript-eslint` v6
...
Port a7253075d1
1 year ago
3be4f4266d
Fix incorrect types in DisplayName
1 year ago
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
1 year ago
447ab7ab24
[Glitch] Convert Home timeline components to Typescript
...
Port a75138d073
1 year ago
177497b367
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
1 year ago
0870c7c95e
[Glitch] Upgrade to Prettier 3
...
Port 73b64b8917
1 year ago
95a1fde6b6
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
1 year ago
5a3f174d56
Fix follow link style in embeds ( #25965 )
1 year ago
a7253075d1
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
a75138d073
Convert Home timeline components to Typescript ( #25583 )
1 year ago
73b64b8917
Upgrade to Prettier 3 ( #25902 )
1 year ago
c2bfbf53a1
Fix various CSS issues
1 year ago
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
1 year ago
ec95f62cb4
[Glitch] Fix sounds not being loaded from assets host
...
Port 1392f31ed8
1 year ago
2aadebc769
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
1 year ago
15f6fa8d47
[Glitch] fix buttons showing inconsistent styles
...
Port ea10febd25
1 year ago
c3af91ce48
[Glitch] Fix filters not applying to explore tab
...
Port af54bf52c8
1 year ago
c699dc0908
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port c27b82a437
1 year ago
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
1 year ago
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
1 year ago
dd0002e1fe
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
1 year ago
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
1 year ago
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
1 year ago
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
1 year ago
Trevor Wolf
Claire
gunchleoc
Stanislas Signoud
Christian Schmidt
github-actions[bot]
Eugen Rochko
Plastikmensch
gol-cha
Jeong Arm
наб
Michael Stanclift
Terence Eden
Renaud Chaput
fusagiko / takayamaki