Commit Graph

144 Commits

Author SHA1 Message Date
Siph d45e85cbf2
Merge tag 'v4.3.2' 2024-12-03 21:56:55 +01:00
Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
2024-12-02 21:49:12 +01:00
Yann 4239baa1f4 Remove constant definition from global scope in embed.js () 2024-12-02 16:20:32 +01:00
Siph 21fc9033f6
merge upstream 2024-09-30 22:02:02 +02:00
Claire 9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Eugen Rochko c352ce6f45
Fix missing permission on new embeds making them unclickable () 2024-09-30 08:20:20 +00:00
Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
2024-09-12 20:05:08 +02:00
Eugen Rochko 3d46f47817
Change embedded posts to use web UI ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Alexis Viguié e0205b6825
merge upstream 2024-07-04 18:47:21 +02:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Claire 7a84b76bb1
Drop favicon.ico generation () 2024-06-26 13:44:08 +00:00
Alexis Viguié 69dc2eddb4
merge upstream 2024-03-30 23:35:57 +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
Renaud Chaput 899eac1a92
Use modern ES syntax rather than `.call` () 2024-02-27 15:42:05 +00:00
Alexis Viguié 518f1bb527
merge upstream$ 2024-01-21 20:25:36 +01:00
Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' 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 'cd37048439f9b324f48e6af1f426a7894c54b4da' 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` () 2024-01-12 09:32:45 +00:00
Essem b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 () 2024-01-11 16:15:08 +00:00
Alexis Viguié fb29a3ebc5 merge upstream 2023-09-19 18:25:01 +02:00
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' 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 () 2023-08-09 11:58:46 +02:00
Alexis Viguié 4d83cd53ba remove old elehpant friend, add it back to public image for use on about page 2023-01-15 23:48:10 +01:00
Siph c7e74736b5
Merge branch 'glitch-soc:main' into main 2023-01-15 23:21:45 +01: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 () 2023-01-05 13:42:13 +01:00
Alexis Viguié 8c658b7f67 merge glitch-soc upstream
remove home page customizations

adapt disabled emoji behavior in compose box

optimize pngs like upstream did
2022-12-17 16:17:12 +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 ()
* 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 () 2022-11-04 16:08:41 +01:00
pea-sys c68e6b52d9
png optimization(loss less) () 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` () 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
Alexis Viguié 0bce298245 adapt donphan branding to new structure 2022-06-16 00:26:10 +02:00
Alexis Viguié ee9e17c3b7 merge upstream, ignore branding changes 2022-06-15 21:25:11 +02:00
Eugen Rochko fe2d6fe105
Fix wrong aspect ratio of logo in icons () 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 ()
- 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
Alexis Viguié b5f281557d Merge branch 'main' of https://github.com/glitch-soc/mastodon into glitch-soc-main 2022-05-20 12:44:22 +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 ()
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 
fix 
2022-05-04 03:20:44 +02:00
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2022-05-01 16:52:27 +02:00
Gaelan Steele 74e20f22cd
Fix light-mode emoji borders. () 2022-04-29 19:23:03 +02:00
Alexis Viguié 759e3ee0d4 cleanup (delete win95 theme + unused images) 2022-02-04 10:35:27 +01:00
Alexis Viguié f417f5b5b8 donphan.social customization (landing page tweaks, custom images, custom font, clickable elefriend removal) 2022-02-04 10:35:27 +01:00
Claire 098f2bc1e1 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-01 20:59:28 +01:00
Rohan Sharma 4d6d4b43c6
Fixed prototype pollution bug and only allow trusted origin () 2022-02-01 17:34:48 +01:00
Claire 0157caacef Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00