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

149 commits

Author SHA1 Message Date
ihateblueb
1377a141d7 add remlit.webp 2025-05-28 18:09:26 -04:00
ihateblueb
5f39304441 remlit mascot 2025-05-28 18:09:14 -04:00
Kopper
911833f860 Merge branch 'main' into standalone 2024-08-04 09:03:46 +03:00
Essem
10e8acae3c
 		Optimize/fix SVG 2024-07-27 18:38:01 -05:00
Essem
69234b092c
 		Add new icon 
Thank you sneexy@lea.pet! https://lea.pet/notes/9vykqqz1l7
 2024-07-27 18:25:18 -05:00
Kopper
29f89db19d Merge remote-tracking branch 'upstream/main' into standalone 2024-07-15 20:18:54 +03:00
Essem
8a01720cb2
 		Merge remote-tracking branch 'upstream/main' 2024-06-30 15:41:10 -05:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Claire
7a84b76bb1
 		Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
Essem
ac041ceefa
 		Remove custom favicon/app icons 
Upstream now includes a way to change them from the admin UI.
 2024-05-08 14:12:58 -05:00
ShittyKopper
f50c41201c update initial state snapshot, including some missing properties 2024-05-07 01:34:09 +03:00
ShittyKopper
1925f6e44c AGPL compliance 2024-05-06 05:26:46 +03:00
ShittyKopper
c71a58c306 fix mastomodern 2024-05-06 05:17:59 +03:00
ShittyKopper
55805e341d add setting for single column mode 2024-05-06 05:09:35 +03:00
ShittyKopper
c1a1050835 complete the merge 2024-05-06 04:48:46 +03:00
ShittyKopper
acf03b3841 Merge remote-tracking branch 'standalone/glitch' into standalone 2024-05-06 04:13:03 +03:00
Essem
54a3fc3ac5
 		Merge remote-tracking branch 'upstream/main' 2024-02-28 22:36:41 -06:00
Claire
c2f0ea415e Merge commit '899eac1a92' 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
Renaud Chaput
899eac1a92
 		Use modern ES syntax rather than .call (#29368) 2024-02-27 15:42:05 +00:00
Essem
d96fd9f28f
 		Merge remote-tracking branch 'upstream/main' 2024-01-16 13:04:33 -06:00
Claire
60298af3c4 Merge commit 'c6684aa1e3' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
 2024-01-15 20:01:36 +01:00
Claire
a3b6a85521 Merge commit 'cd37048439' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
 2024-01-13 12:11:29 +01:00
Renaud Chaput
c6684aa1e3
 		Use the assets pipeline to load inert.css (#28701) 2024-01-12 09:32:45 +00:00
Essem
b6e353537b
 		Add new emojis from jdecked/twemoji 15.0 (#28404) 2024-01-11 16:15:08 +00:00
Essem
dfe6628e4b
 		Add new emojis from jdecked/twemoji 15.0 2023-12-16 16:25:22 -06:00
Laura Hausmann
aa27eaece4
 		Fix languages crash 2023-10-12 21:08:11 +02:00
Laura Hausmann
4a61246750
 		Remove issue templates 2023-10-12 21:01:51 +02:00
Laura Hausmann
d35cbe4473
 		Remove /deck prefix 2023-10-12 20:13:44 +02:00
Laura Hausmann
e6fd0de840
 		Update patchset to upstream glitch 2023-10-12 20:13:43 +02:00
Laura Hausmann
960614ec6f
 		Merge patchset from akko branch 2023-10-12 20:13:42 +02:00
Essem
e8ba9a39d7
 		Merge remote-tracking branch 'upstream/main' 2023-08-15 17:18:04 -05:00
Claire
6530f9709c Merge commit '121443c0fc' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Foritus
405f141fe0
 		Change: Block GPTBot (#26396) 2023-08-09 11:58:46 +02:00
Essem
cae549beda
 		missed one 2023-06-03 12:32:36 -05:00
koyu
cb0adf81f1
 		Move from Giphy to Tenor 2023-02-16 13:16:50 -06:00
Claire
6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
 2023-01-05 14:16:25 +01:00
Nick Schonning
558ac411c4
 		Expand Stylelint glob to include CSS files (#22469) 2023-01-05 13:42:13 +01:00
Claire
f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
 2022-12-15 20:25:25 +01:00
Matt Hodges
4114a7088a
 		Embed js height fix (#22141) 
* only begin iframe reheight once document state is complete

* format

* lint fixes

* Update public/embed.js to use readystatechange event listener

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Call loaded() if ready, otherwise add listenter

* lint fix

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2022-12-15 16:18:59 +01:00
Claire
0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 2022-11-06 09:50:41 +01:00
Eugen Rochko
e02812d5b6
 		Add assets from Twemoji 14.0 (#19733) 2022-11-04 16:08:41 +01:00
pea-sys
c68e6b52d9
 		png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
Claire
077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
 2022-08-28 11:31:00 +02:00
Yamagishi Kazutoshi
81e1cc5fec
 		Replace to workbox-webpack-plugin from offline-plugin (#18409) 2022-08-25 20:10:01 +02:00
Claire
0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
 2022-06-21 08:28:59 +02:00
Eugen Rochko
fe2d6fe105
 		Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
Claire
15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
 2022-06-11 00:08:41 +02:00
Eugen Rochko
45aa5781ce
 		Change brand color and logotypes (#18592) 
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
 2022-06-09 22:25:23 +02:00
Claire
c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`
 2022-05-04 19:15:50 +02:00
rinsuki
6e736f2452
 		fix: embed.js doesn't expands iframes height (#18301) 
also including some refactoring:
- add `// @ts-check`
- use Map to completely avoid prototype pollution
- assign random id to each iframe for reduce chance to brute-force attack, and leak of iframe counts
- check iframe.contentWindow and MessageEvent.source to validate message is coming from correct iframe (it works on latest Chrome/Firefox/Safari but I'm not sure this is allowed by spec)

follow-up of #17420
fix #18299
 2022-05-04 03:20:44 +02:00