mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-09 19:56:20 +01:00
Code Issues Projects Releases Wiki Activity
15,040 Commits 126 Branches 269 Tags 1 GiB
Commit Graph

5073 Commits

Author SHA1 Message Date
Takeshi Umeda
9bb3341849
Fix to update suggestion list after dismiss (#16044) 
* Fix to update suggestion list after dismiss

* Change to inline

* Fix style
 2021-04-16 10:06:16 +02:00
Claire
e78d06eecf
Add border to 🚲 emoji (#16035) 2021-04-13 23:43:51 +02:00
Eugen Rochko
f7117646af
Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
Eugen Rochko
2ae8c41e5d [Glitch] Add system checks to dashboard in admin UI 
Port SCSS changes from 487e37d6d46d81caac54c536791ad1a16a4eb267

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-04-05 14:34:36 +02:00
Claire
6be0b4b014 [Glitch] Fix crash in old browsers 
Port abad99fa103246075f364278dfb43a5ed0784075 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-04-05 14:33:42 +02:00
Claire
c901ae77d4 Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +02:00
Noiob
39b9a0619a Remove superfluous toot length check 2021-04-05 14:30:43 +02:00
Eugen Rochko
487e37d6d4
Add system checks to dashboard in admin UI (#15989) 2021-04-03 14:12:30 +02:00
Claire
abad99fa10
Fix crash in old browsers (#15985) 
Fixes #15984
 2021-04-01 00:00:12 +02:00
Claire
15efa32cca Merge branch 'main' into glitch-soc/merge-upstream 2021-03-31 10:34:29 +02:00
Marcin Mikołajczak
f8e50eaea3
Add transition to media modal background (#15843) 
* Add transition to media modal background

* use reduceMotion

* Move background color transition into css

Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
 2021-03-24 13:51:32 +01:00
Claire
5ea53b6158 [Glitch] Fix compose form behavior in mobile view 
Port 034f37b85a716872f78a72048a5a225cdcaa840a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-24 11:21:21 +01:00
dependabot[bot]
b61e44461c [Glitch] Bump react-select from 3.2.0 to 4.0.2 
Add cacheKey to NonceProvider for react-select

Port changes from c3aef491d66aec743a3a53e934a494f653745b61 to glitch-soc

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-24 11:01:57 +01:00
Claire
f60c99a8fb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
Claire
034f37b85a
Fix compose form behavior in mobile view (#15555) 
* Fix ComposeForm being mounted twice in mobile view

Fixes #13094

* Fix compose form focus and pre-selection behavior in mobile view

* Split _updateFocusAndSelection out of componentDidUpdate
 2021-03-24 10:19:07 +01:00
dependabot[bot]
c3aef491d6
Bump react-select from 3.2.0 to 4.0.2 (#15624) 
* Bump react-select from 3.2.0 to 4.0.2

Bumps [react-select](https://github.com/JedWatson/react-select) from 3.2.0 to 4.0.2.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

* Add cacheKey to NonceProvider for react-select

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2021-03-22 15:41:47 +09:00
Claire
5d48402be1
Fixing the hero widget (#15926) 
* Removing last-child padding conflicts with light theme in hero widget

* Add missing background color to widget

* Reset widget.scss to default

* Hope this works

Co-authored-by: koyu <me@koyu.space>
 2021-03-19 20:23:32 +01:00
Claire
2bb573d021 Messing around with box-shadow 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-19 14:47:57 +01:00
Claire
e71f4d468b Add more button states? 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-19 14:47:54 +01:00
Claire
200d7a1708 Change notification settings UI to be more compact 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-19 14:47:06 +01:00
Claire
3b7b607300 Migrate glitch-soc local notification settings to upstream system 2021-03-19 13:57:36 +01:00
Claire
db6551ec09 Add option to opt out of unread notification markers 
Port 55ac2b9c6085def9e692fa69b849239c1249d9fd to glitch-soc
 2021-03-19 13:57:32 +01:00
Claire
3ad6ef72cb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-19 13:57:15 +01:00
Claire
55ac2b9c60
Add option to opt out of unread notification markers (#15842) 
Fixes #15133
 2021-03-19 02:44:57 +01:00
Claire
318efa49de Fix various CodeClimate warnings 2021-03-06 14:51:53 +01:00
Claire
7336276252 [Glitch] Update twitter-text from 1.14 to 3.1.0 and fix toot character counting 
Port 65db2625508c220fd3c0a1f37cdd2e13b6e02987 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-02 12:37:23 +01:00
Claire
7cffe8dca7 [Glitch] Add borders to 📱 and 📲 emojis 
Port a8139ab0160096d09d83e8d3f9c7849129be1aa8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-02 12:27:29 +01:00
Claire
974ddc28a3 [Glitch] Fix WebUI crashing when SVG support is disabled 
Port 0635c8760dfdfeb3d763f1d1ae6cf5a208b29b6c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-02 12:26:12 +01:00
Claire
d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
 2021-03-02 12:06:58 +01:00
Claire
65db262550
Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) 
* Update twitter-text from 1.14 to 3.1.0

* Disable emoji parsing

* Properly depend on twitter-text for url detection

* Fix some URLs being wrongly detected client-side

* Add test for server-side validation of non-autolinkable URLs

* Fix server-side status length counting
 2021-03-02 12:02:56 +01:00
Claire
a8139ab016
Add borders to 📱 and 📲 emojis (#15794) 2021-03-01 21:22:54 +01:00
Claire
0635c8760d
Fix WebUI crashing when SVG support is disabled (#15809) 
Fixes #14910
 2021-02-28 01:01:34 +01:00
abcang
6ae04d990c [Glitch] Fix default searchTokens 
Port 2127f40e6bf6deab62f48030263c459d14fed364 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-22 15:47:17 +01:00
Eugen Rochko
24fb5d7572 [Glitch] Add server rules 
Port SCSS changes from 8331fdf7e0ea85ecc6d7dbff00b784bb6aa1f7d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-22 15:45:28 +01:00
Claire
679642e26c Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
abcang
2127f40e6b
Fix default searchTokens (#15775) 2021-02-22 11:26:08 +01:00
Eugen Rochko
8331fdf7e0
Add server rules (#15769) 2021-02-21 19:50:12 +01:00
Claire
49eef466b8 [Glitch] Add dropdown for boost privacy in boost confirmation modal 
Port 07b46cb332ae197584e3ed3f23fe814b7793ec4c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-12 12:31:49 +01:00
Claire
9213b02656 Refactor privacy dropdown to have an interface closer to upstream's 2021-02-12 12:04:04 +01:00
kaias1jp
847779b1e4 [Glitch] Fixed WebUI crash when a status opened in the media modal is deleted 
Port 08ae116dc62c51988e9710b4f0cc9fdb2e9557b9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-12 10:58:34 +01:00
Jeong Arm
8f24f7626a [Glitch] Use custom mascot on static share page 
Port d499bb031f0d20a5f27facfd57cf4e00f89003d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-12 10:57:09 +01:00
Mélanie Chauvel
0e7484209c [Glitch] Slightly reorder three dots menu on toots to make it more intuitive 
Port f5fefdc11aee24626d78480766fda878911f58b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-12 10:55:37 +01:00
Eugen Rochko
28f533f370 [Glitch] Change max. image dimensions to 1920x1080px (1080p) 
Port acf1842896682674d9ab4d0f87ec04c6174468fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-02-12 10:46:00 +01:00
Claire
5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
 2021-02-12 10:28:32 +01:00
kaias1jp
08ae116dc6
Fixed WebUI crash when a status opened in the media modal is deleted (#15701) 
* Fixed picture in picture compatibility error in WebUI when status is deleted

* Revert "Fixed picture in picture compatibility error in WebUI when status is deleted"

This reverts commit f003b7d9d88688e9504f7dfae1545d7522fcfd98.

* Close the modal display of the image when status is deleted

* Fixed the case statement before the default statement

* Removed unnecessary parts
 2021-02-11 19:59:47 +01:00
Takeshi Umeda
7927959d8f
fix typo (#15705) 2021-02-11 06:22:11 +01:00
Jeong Arm
d499bb031f
Use custom mascot on static share page (#15687) 
* Use custom mascot on static share page

* Use full_asset_url
 2021-02-11 02:18:56 +01:00
Mélanie Chauvel
f5fefdc11a
Slightly reorder three dots menu on toots to make it more intuitive (#15647) 
* Slightly reorder three dots menu on toots to make it more intuitive

- Make “Pin to profile” always appear at the same place
- Add separator to group “Bookmark” and “Pin to profile”
- Fix separator being the first item in some cases

* Fix missing semicolon and keep status_action_bar.js and action_bar.js in sync
 2021-02-11 01:05:04 +01:00
Claire
07b46cb332
Add dropdown for boost privacy in boost confirmation modal (#15704) 
* Various dropdown code quality fixes

* Prepare support for privacy selection in boost modal

* Add dropdown for boost privacy in boost confirmation modal
 2021-02-11 00:53:12 +01:00
Claire
a30a40c437 Fix background color for favourite modal on DMs 2021-02-10 19:27:18 +01:00