mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,189 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

3812 Commits (a70b1141d6d3039ab43366561037ea28a2747d6f)

Author SHA1 Message Date
Claire b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 0fb469e2f3 Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream 2024-05-01 17:30:52 +02:00
Claire 3503fe1865 Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
Claire 2c386d4cfe Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire 7f404fd635 Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream 2024-05-01 16:47:25 +02:00
Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.
 2024-05-01 16:10:45 +02:00
Claire 3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
Claire a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`

All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.

Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
 2024-05-01 14:25:47 +02:00
github-actions[bot] 56821ed879
New Crowdin Translations (automated) (#30128) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-30 09:05:53 +00:00
Claire 7d3fe2b4c3
Add loading indicator and empty result message to advanced interface search (#30085) 2024-04-29 09:55:41 +00:00
Renaud Chaput b9b4db483c
Remove usage of deprecated `defaultTypes` on React functional components (#30099) 2024-04-29 09:29:59 +00:00
github-actions[bot] 9be7efedf0
New Crowdin Translations (automated) (#30092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-29 08:15:43 +00:00
David Beck 4f4b77920e
Remove home marker updates (#22721) 2024-04-29 07:55:58 +00:00
Renaud Chaput 65093c619f
Fix marker thunks to not ignore eslint directives for the whole file (#30089) 2024-04-26 17:11:27 +00:00
Claire de4a7bf531
Change moderation warning notification icon (#30081) 2024-04-26 15:33:15 +00:00
github-actions[bot] 5201882a23
New Crowdin Translations (automated) (#30077) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-26 10:05:18 +00:00
Claire 4ef0b48b95
Add in-app notifications for moderation actions/warnings (#30065) 2024-04-25 17:26:05 +00:00
Eugen Rochko 0ec061aa8f
Change design of people tab on explore in web UI (#30059) 2024-04-25 16:25:33 +00:00
github-actions[bot] 85fdbd0ad5
New Crowdin Translations (automated) (#30062) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-25 08:50:54 +00:00
github-actions[bot] ebcf9840f4
New Crowdin Translations (automated) (#30050) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-24 08:45:24 +00:00
Eugen Rochko 74012831f6
Change mute options to be in dropdown on muted users list in web UI (#30049) 2024-04-24 08:45:12 +00:00
github-actions[bot] d754b15afb
New Crowdin Translations (automated) (#30034) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-23 09:07:05 +00:00
Tim Rogers 75163d9daf
Fixed rendering error on /start when not logged in (#30023) 2024-04-22 08:53:08 +00:00
github-actions[bot] 3655fb6a22
New Crowdin Translations (automated) (#30014) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-22 08:42:35 +00:00
github-actions[bot] ec71c02c4b
New Crowdin Translations (automated) (#29994) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-19 13:57:43 +00:00
github-actions[bot] 443186ff40
New Crowdin Translations (automated) (#29980) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-18 11:18:39 +00:00
github-actions[bot] c35042b7eb
New Crowdin Translations (automated) (#29972) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-17 09:07:13 +00:00
Claire 66ee0d4a1f
Fix incorrect label for filtered notifications badge (#29922) 2024-04-16 09:25:23 +00:00
github-actions[bot] 285d4123b5
New Crowdin Translations (automated) (#29955) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-16 08:36:21 +00:00
github-actions[bot] 4e78cb9988
New Crowdin Translations (automated) (#29939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-15 09:29:39 +00:00
Claire c386c36866
Add `/` keyboard shortcut to focus the search field (#29921) 2024-04-12 09:42:12 +00:00
github-actions[bot] 5992df0762
New Crowdin Translations (automated) (#29920) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-12 08:19:48 +00:00
github-actions[bot] 20b1e55f24
New Crowdin Translations (automated) (#29903) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-11 10:30:31 +00:00
github-actions[bot] db5a5636d9
New Crowdin Translations (automated) (#29888) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-10 13:03:40 +00:00
github-actions[bot] 13faf26315
New Crowdin Translations (automated) (#29859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-08 13:44:54 +00:00
Renaud Chaput 730e2127e1
Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) (#29869) 2024-04-08 08:17:51 +00:00
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
 2024-04-06 21:01:40 +02:00
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire 67842ffb22 Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
Renaud Chaput 6ac90d4c5d
Add tests for our number formatting function (#29852) 2024-04-05 08:06:31 +00:00
Renaud Chaput 906a399634
Fix wrong extension for a test file (#29853) 2024-04-05 07:57:44 +00:00
renovate[bot] 37d984b8bf
Update eslint (non-major) (#29820) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-04-03 18:05:39 +00:00
github-actions[bot] 56d13069cd
New Crowdin Translations (automated) (#29836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-03 09:04:29 +00:00
Renaud Chaput b4d991adaa
Use integers and not numbers in notification policy API counters (#29810) 2024-04-02 10:06:26 +00:00
Renaud Chaput e47a3d00fe
Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
Renaud Chaput 07635228e2
Fix Redux Middleware types (#29800) 2024-04-02 09:56:03 +00:00
github-actions[bot] c717747603
New Crowdin Translations (automated) (#29812) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-02 09:26:06 +00:00
Renaud Chaput 69e5771881
Handle `createAppAsyncThunk` rejected actions in the errors middleware (#29791) 2024-03-29 13:57:39 +00:00
github-actions[bot] f96648d41c
New Crowdin Translations (automated) (#29796) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-29 13:35:50 +00:00
Renaud Chaput 67442f9039
Remove global `boosts` state and convert boosts modal to Typescript (#29774) 2024-03-28 15:33:15 +00:00
github-actions[bot] 8a498f4e65
New Crowdin Translations (automated) (#29785) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-28 14:48:09 +00:00
Renaud Chaput 961bb84e4c
Fix `<RelativeTimestamp>` types (#29781) 2024-03-28 10:07:01 +00:00
Renaud Chaput d088964761
Fix props for `<Button>` (#29780) 2024-03-28 10:06:25 +00:00
Renaud Chaput f2fd1da23f
Fix PropTypes for some record objects (#29786) 2024-03-28 10:05:16 +00:00
github-actions[bot] 1025fff6b9
New Crowdin Translations (automated) (#29772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-27 21:19:03 +00:00
Renaud Chaput b9982ce578
Fix notifications marker fetch (#29777) 2024-03-27 15:49:02 +00:00
Renaud Chaput 9fbe8d3a0c
Rewrite PIP state in Typescript (#27645) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-27 15:19:33 +00:00
Renaud Chaput 27d014a7fa
Rewrite markers reducer in Typescript (#27644) 2024-03-27 12:47:09 +00:00
github-actions[bot] b3d970bdb8
New Crowdin Translations (automated) (#29756) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-26 09:49:19 +00:00
Renaud Chaput 02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) (#29748) 
Co-authored-by: Nishiki Liu <hello@nshki.com>
 2024-03-26 09:25:49 +00:00
Eugen Rochko 0cea7a623b
Fix background and icon on notification requests in web UI (#29706) 2024-03-25 13:39:06 +00:00
Eugen Rochko 29f9dc742e
Change design of notification about lost connections in web UI (#29731) 2024-03-25 13:27:38 +00:00
github-actions[bot] 799e3be9bd
New Crowdin Translations (automated) (#29726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-25 11:07:38 +00:00
Eugen Rochko 8e7e86ee35
Add ability to reorder uploaded media before posting in web UI (#28456) 2024-03-25 10:29:55 +00:00
Renaud Chaput 6c381f20b1
Restore advanced filter bar setting (#29737) 2024-03-24 14:17:06 +00:00
Claire 37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional (#29373) 2024-03-22 16:24:04 +00:00
Claire 387c78ddf9
Change icon of severed relationships notifications (#29712) 2024-03-22 15:45:04 +00:00
Claire dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714) 2024-03-22 15:44:31 +00:00
github-actions[bot] 5db5fa879b
New Crowdin Translations (automated) (#29708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-22 14:50:03 +00:00
Renaud Chaput ec1e770fea
Add the role ID to the badge component (#29707) 2024-03-22 11:59:35 +00:00
Claire 885d0faf83
Fix duplicate translation string for severed relationships (#29689) 2024-03-21 10:06:21 +00:00
github-actions[bot] c007dd5dd2
New Crowdin Translations (automated) (#29687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-21 09:57:45 +00:00
Claire c0aade79b0 Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream 2024-03-20 18:31:09 +01:00
Eugen Rochko be52633ee4
Change back button to always appear in advanced web UI (#29669) 2024-03-20 17:21:03 +00:00
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
Claire 3211e960ac
Fix “Explore” icon in navigation bar not being filled when selected (#29649) 2024-03-20 13:31:31 +00:00
Claire eb3aed9545 Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-20 12:27:52 +01:00
Claire 94f7ae192b
Fix emoji picker placement on limited-height viewports (#29651) 2024-03-20 11:07:02 +00:00
Claire a583317df6
Fix icon and styling in browser notifications banner (#29658) 2024-03-20 11:06:44 +00:00
github-actions[bot] 6c0b1a41a1
New Crowdin Translations (automated) (#29657) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-20 08:39:42 +00:00
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-19 19:21:12 +01:00
Claire ffc5be4820
Change filtered icon from “archive” to “inventory 2” (#29652) 2024-03-19 15:39:26 +00:00
github-actions[bot] 4e61bce4e9
New Crowdin Translations (automated) (#29641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-19 08:36:52 +00:00
Jeong Arm 39839baec3
Fix mute for 30 days (#29640) 2024-03-19 08:18:14 +00:00
github-actions[bot] 04817e965a
New Crowdin Translations (automated) (#29623) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-18 08:47:48 +00:00
Claire 726e7ad024
Fix extra separator besides favourite count on private posts (#29605) 2024-03-16 01:11:59 +00:00
Claire b8f476256e Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream 2024-03-15 22:48:04 +01:00
Claire 1b06e4e1b7 Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
 2024-03-15 22:37:55 +01:00
Claire d702a03a0c
Add “Learn more” on block modal to inform of federation caveats (#29614) 2024-03-15 19:09:21 +00:00
Claire 2c622497c2 Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream 2024-03-15 18:48:39 +01:00
Eugen Rochko ec19d0a14b
Change mute, block and domain block confirmations in web UI (#29576) 2024-03-15 17:36:41 +00:00
Claire be7a68b095
Change Explore icon to compass in advanced interface (#29610) 2024-03-15 16:06:48 +00:00
Renaud Chaput c76ae7a5c0
Convert `packs/public.jsx` to Typescript (#29501) 2024-03-15 13:16:45 +00:00
Eugen Rochko 407287573c
Add domain information to profiles in web UI (#29602) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 13:08:38 +00:00
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-15 10:02:10 +00:00
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Eugen Rochko 30483d618f
Fix back button appearing in column header unexpectedly in web UI (#29551) 2024-03-14 10:01:55 +00:00
Claire 95a5713ff7
Fix accounts not getting imported into redux store for some filtered notification types (#29588) 2024-03-14 09:34:36 +00:00
Eugen Rochko 4991198b70
Change design of metadata underneath posts in web UI (#29585) 2024-03-14 09:18:24 +00:00
Eugen Rochko 1e1d97a787
Fix wrong background color on search results in web UI (#29584) 2024-03-14 09:07:29 +00:00
github-actions[bot] 5aea35de13
New Crowdin Translations (automated) (#29587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-14 09:00:42 +00:00
mogaminsk 3156d04ec1
Use sender's `username` to column title in notification request if it's `display_name` is not set (#29575) 2024-03-14 08:58:44 +00:00
Claire 65ca37bbaa Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes.
 2024-03-13 20:14:18 +01:00
Claire 48134bcd10 Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2024-03-13 20:13:29 +01:00
Claire 06881a8669 Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream 2024-03-13 19:16:47 +01:00
Claire c6dbb33944 Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream 2024-03-13 18:58:47 +01:00
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2024-03-13 18:56:40 +01:00
Claire a32a126cac
Hide media by default in notification requests (#29572) 2024-03-13 16:47:48 +00:00
Renaud Chaput acf3f410ae
Fix navigation panel icons missing classes (#29569) 2024-03-13 12:54:50 +00:00
github-actions[bot] 171948b910
New Crowdin Translations (automated) (#29563) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-13 12:42:44 +00:00
Matt Jankowski 00d94f3ffa
Use vanilla JS to get Rails CSRF values (#29403) 2024-03-12 17:10:37 +00:00
Eugen Rochko 5b60d4b696
Change background color in web UI (#29522) 2024-03-12 09:51:30 +00:00
Renaud Chaput af4e44e30a
Fix i18n typo (#29557) 2024-03-12 09:42:51 +00:00
github-actions[bot] dc36b961aa
New Crowdin Translations (automated) (#29554) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-12 09:03:51 +00:00
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
Eugen Rochko 19efa1b9f1
Change action button to be last on profiles in web UI (#29533) 2024-03-11 14:33:48 +00:00
Eugen Rochko 16c856729b
Change icons in navigation panel to be filled when active in web UI (#29537) 2024-03-11 13:35:23 +00:00
Renaud Chaput b9722dfe2b
Use the server setting to get the max number of poll options in UI (#29490) 2024-03-11 09:13:35 +00:00
Eugen Rochko 2347ea813e
Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532) 2024-03-11 08:57:23 +00:00
Eugen Rochko 5b3a8737d6
Add hints for rules (#29539) 2024-03-11 08:57:07 +00:00
github-actions[bot] f85168b189
New Crowdin Translations (automated) (#29467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-11 07:37:04 +00:00
Claire 442a5cb66c Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream 2024-03-07 12:59:51 +01:00
Mashiro b8bd94ca8e
Fix unhandled nullable attachments limitation counter (#29183) 2024-03-06 12:53:54 +00:00
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
Claire f24c62a5c8
Fix preview card player getting embedded when clicking on the external link button (#29457) 2024-02-29 13:54:02 +00:00
Renaud Chaput 4185f3792c
Fix full date display not respecting the locale 12/24h format (#29448) 2024-02-29 09:40:13 +00:00
github-actions[bot] cdf5098166
New Crowdin Translations (automated) (#29452) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-29 09:38:33 +00:00
Claire ccdf56085d Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream 2024-02-28 20:37:38 +01:00
Claire 21e7a53ca5 Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
  were changed, but otherwise no real conflict.
  Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
  Upstream's dependencies changed the code style rules for json formatting, and
  we had local changes.
  Kept our changes, but with upstream's formatting/
- `yarn.lock`:
  A dependency textually adjacent to a glitch-soc-only one got changed.
  Applied upstream's change, keeping the glitch-soc-only dependency.
 2024-02-28 20:27:28 +01:00
Claire c2f0ea415e Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
 2024-02-28 20:10:01 +01:00
github-actions[bot] 7f84bbfd92
New Crowdin Translations (automated) (#29430) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-28 12:14:42 +00:00
Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.
 2024-02-27 19:20:57 +01:00
renovate[bot] dc4427dc9b
Update devDependencies (non-major) (#29089) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-02-27 16:07:43 +00:00
Renaud Chaput 899eac1a92
Use modern ES syntax rather than `.call` (#29368) 2024-02-27 15:42:05 +00:00
github-actions[bot] bc4c5ed918
New Crowdin Translations (automated) (#29423) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-27 14:53:53 +00:00
Claire 90573c3abb
Change behavior of privacy dropdown to only change value on validation (#29406) 2024-02-27 11:41:19 +00:00
Claire 67ca8bb56a Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.
 2024-02-26 17:43:16 +01:00
Roni Laukkarinen 10fdd88288
Change new explore compass icon CSS class to explore (#29395) 2024-02-26 15:28:38 +00:00
github-actions[bot] 98e3dc2578
New Crowdin Translations (automated) (#29382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-26 13:03:06 +00:00