djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-19 22:22:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,137 Commits 69 Branches 22 Tags 412 MiB
Commit Graph

2772 Commits

Author SHA1 Message Date
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
6ee7a64465
Reduce differences with upstream in “public” pack (#2680) 
* Reduce differences with upstream

* Further reduce pack differences with upstream
 2024-03-15 22:21:57 +01:00
Eugen Rochko
a32f992182 [Glitch] Add domain information to profiles in web UI 
Port 407287573c9c602c5490224c43639b39edf7d48a to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 18:51:41 +01:00
Eugen Rochko
000a900d3b [Glitch] Fix back button appearing in column header unexpectedly in web UI 
Port 30483d618f94ed85ac90c78ae24fc40349891208 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:43:38 +01:00
Claire
84c7b272e1 [Glitch] Fix accounts not getting imported into redux store for some filtered notification types 
Port 95a5713ff73787bdea8a2d5cb848386bf8c4fe80 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:43:38 +01:00
Eugen Rochko
4b2a935c4a [Glitch] Change design of metadata underneath posts in web UI 
Port 4991198b703f5020ab136062fe7d5ef44e8f0aec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:43:38 +01:00
Eugen Rochko
042d17ddf1 [Glitch] Fix wrong background color on search results in web UI 
Port 1e1d97a78727570bb3343aa4008b93edae3dde1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:30:46 +01:00
mogaminsk
88f477749c [Glitch] Use sender's username to column title in notification request if it's display_name is not set 
Port 3156d04ec12294b4b211b191b22d245e18aba024 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:29:38 +01:00
Claire
369e728536 Fix collapsed posts background color 2024-03-13 20:17:58 +01:00
Claire
e7b49181af [Glitch] Hide media by default in notification requests 
Port a32a126cac42c73236236b5a9bd660765b9c58ee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 20:15:23 +01:00
Renaud Chaput
663dd49a85 [Glitch] Fix navigation panel icons missing classes 
Port acf3f410aef3cfb9e8f5f73042526de9b2f96d13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 20:13:35 +01:00
Erik Uden
e1b64151a2 [Glitch] Fix toggle button color for light (and dark/default) theme 
Port 268856d5d9f72f003a08a53c7d094ed4df7c16bc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 20:13:35 +01:00
Matt Jankowski
00d72866a3 [Glitch] Use vanilla JS to get Rails CSRF values 
Port 00d94f3ffabda89a2f955212e763cdba3f1f54c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 19:17:59 +01:00
Eugen Rochko
8c0673037a [Glitch] Change background color in web UI 
Port 5b60d4b696cd5fd58ca77eca3365c2a0761c0f57

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 19:05:05 +01:00
Renaud Chaput
435c46b316 [Glitch] Fix i18n typo 
Port af4e44e30a6a2701102a7d573e47e9db42025821 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 18:58:00 +01:00
Eugen Rochko
b36e96ec90 [Glitch] Change action button to be last on profiles in web UI 
Port 19efa1b9f1486ffe95c14582017d9e9ede48d597 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 18:40:00 +01:00
Eugen Rochko
13c9524436 [Glitch] Add notification policies and notification requests in web UI 
Port c10bbf5fe3800f933c33fa19cf23b5ec4fb778ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 18:38:46 +01:00
Eugen Rochko
3631ddbfc9 [Glitch] Change icons in navigation panel to be filled when active in web UI 
Port 16c856729bfa400422825b06c843efe7b85c72f8

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 18:09:07 +01:00
Renaud Chaput
6440651976 [Glitch] Use the server setting to get the max number of poll options in UI 
Port b9722dfe2bdb024e5e98b96d2fc5712d6cb5f747 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:38:07 +01:00
Eugen Rochko
efbc8cba17 [Glitch] Change dropdown menu icon to not be replaced by close icon when open in web UI 
Port 2347ea813e5be2ecf762c8a275373a3e2bea56e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:36:07 +01:00
Eugen Rochko
777510a696 [Glitch] Add hints for rules 
Port 5b3a8737d6fa84c91e5158c34170f488df9ad313 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:34:02 +01:00
Claire
46152a19a6 Convert logo.jsx to Typescript 2024-03-08 12:46:49 +01:00
Sunny Ripert
2b4e9fbc71 [Glitch] Add form element on focal point modal 
Port 8515bc79628c6e753a09a7da42eff9ce7ed4ade7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-08 12:43:59 +01:00
Claire
98cf4b7ba0 Reduce code differences with upstream 2024-03-08 12:42:03 +01:00
neetshin
6996b96fab [Glitch] Make columns-area unscrollable when modal opened 
Port 2091ae92be5d04cd4dadb2200c507ce8d8d2623e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-08 11:50:23 +01:00
Claire
a79bd2cd11 Make some CSS differences with upstream more explicit 2024-03-08 11:47:34 +01:00
Claire
e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional (#2666) 2024-03-08 11:35:18 +01:00
github-actions[bot]
d002458c7b
New Crowdin Translations (automated) (#2661) 
* New Crowdin translations

* Fix bogus translations

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-07 22:39:48 +01:00
Mashiro
1fc6edfa84 [Glitch] Fix unhandled nullable attachments limitation counter 
Port b8bd94ca8edb5a675ef70aac9c941ed340efc127 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-07 13:01:21 +01:00
Claire
3f239facff
Update flavor screenshots (#2664) 2024-03-07 12:59:00 +01:00
Claire
8c9341a67b
Further reduce pointless CSS differences with upstream (#2665) 2024-03-06 22:13:23 +01:00
GitHub Actions
1b418a3550 New Crowdin translations 2024-03-04 04:57:12 +00:00
Claire
f6654e0842 Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  This file was split between `app/javascript/core/admin.js`,
  `app/javascript/pack/admin.jsx`, and
  `app/javascript/flavours/glitch/packs/admin.jsx`.
  Ported upstream's change, splitting the new file to
  `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
  and `app/javascript/flavours/glitch/packs/admin.tsx`
 2024-02-29 19:02:31 +01:00
Claire
a04b384482 [Glitch] Fix regression with search bar icon position 
Port edd6aa70e1117818669cf0b85b7a3cde06a3c8c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-29 18:30:24 +01:00
Claire
bbfcd71118 [Glitch] Fix preview card player getting embedded when clicking on the external link button 
Port f24c62a5c809e9d3ec944804a9c28804d9896bbd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-29 18:29:57 +01:00
Renaud Chaput
5b97fdf84c [Glitch] Fix full date display not respecting the locale 12/24h format 
Port 4185f3792c84fb81ba74be047a7014be3ab318ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-29 18:29:11 +01:00
Claire
8dbdd7571f
Merge pull request #2655 from TheEssem/fix/open-in 
Use upstream's openURL function for search
 2024-02-29 18:23:56 +01:00
Essem
9242c536d2
Use openURL function from upstream 2024-02-28 23:41:18 -06:00
GitHub Actions
ab195bcee1 New Crowdin translations 2024-02-29 04:27:18 +00:00
Jeong Arm
4004801ee8 [Glitch] Show comments in the admin/instances page 
Port deffb8ecb6d2eb384e4d9237f4918be664f21cf9 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:38:17 +01:00
Roni Laukkarinen
c844817c78 [Glitch] Fix the regression with the search icon position 
Port edfc53856f03e3948c2c6760bb425f74dbb24178 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:37:48 +01:00
renovate[bot]
9324fbe984 [Glitch] Update devDependencies (non-major) 
Port dc4427dc9ba4d084d96153feb2eef6a32c288e1f to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:30:58 +01:00
Renaud Chaput
0ff9800989 [Glitch] Use modern ES syntax rather than .call 
Port 899eac1a92c802c334606a49d538ef37bd47c91a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:11:26 +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
Claire
c19787f3f4
Add doodle feature back (#2652) 2024-02-27 21:27:51 +01:00
Claire
e8155319c7 Take advantage of upstream's refactor and reduce code duplication 2024-02-27 19:28:13 +01:00
Claire
916d78373d [Glitch] Change behavior of privacy dropdown to only change value on validation 
Port 90573c3abbc0783c25cb4e3aa8c298e10259cb57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-27 19:24:34 +01:00
Evan Paterakis
1b219e709b [Glitch] Fix filters title and keywords overflow 
Port 213c87ae595cc1ddcb618516106712b0aae789bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-27 19:24:03 +01:00
Matt Jankowski
8a80ad7fc4 [Glitch] Remove unused media-spoiler-* JS/CSS 
Port c7555271a6584d9e7648383641f0c2d9b45ef8fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00
Roni Laukkarinen
20bc633b0c [Glitch] Change new explore compass icon CSS class to explore 
Port 10fdd882886c9154a532ce0789c5ad7d6eae6b5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00