mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 14:03:16 -08:00
Code Issues Projects Releases Packages Wiki Activity
21,359 commits 2 branches 0 tags 263 MiB
Commit graph

3,664 commits

Author SHA1 Message Date
Claire
0f90e624c5 Merge commit '672c9f5f05' 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 '8a498f4e65' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire
7b46517c38 Merge commit 'd49343ed11' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
Claire
a6147a831f Merge commit '02ea161506' 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
Claire
0e76b919b5 Merge commit '0cea7a623b' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire
1d1c3a808a Merge commit '6c381f20b1' 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 '119c7aa0df' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire
903dc53522 Merge commit '05eda8d193' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire
67842ffb22 Merge commit '01464074c9' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire
f2b23aa5f3 Merge commit '954b470fbc' 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
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 '8a1423a474' 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 '50fd94f481' 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 'ffc5be4820' 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 'd702a03a0c' into glitch-soc/merge-upstream 2024-03-15 22:48:04 +01:00
Claire
1b06e4e1b7 Merge commit 'c76ae7a5c0' 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