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 2127f40e6b
2021-02-22 15:47:17 +01:00
Eugen Rochko
24fb5d7572
[Glitch] Add server rules
...
Port SCSS changes from 8331fdf7e0
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 07b46cb332
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 08ae116dc6
2021-02-12 10:58:34 +01:00
Jeong Arm
8f24f7626a
[Glitch] Use custom mascot on static share page
...
Port d499bb031f
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 f5fefdc11a
2021-02-12 10:55:37 +01:00
Eugen Rochko
28f533f370
[Glitch] Change max. image dimensions to 1920x1080px (1080p)
...
Port acf1842896
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
Eugen Rochko
acf1842896
Change max. image dimensions to 1920x1080px (1080p) ( #15690 )
...
* Change max. image size to 1920x1080px
* Change it in web UI too
2021-02-09 01:21:06 +01:00
ThibG
e1fa06c459
[Glitch] Change custom emoji to be animated when hovering container
...
Port 3efa0c54b6
2021-02-03 17:16:22 +01:00
Claire
4d40685850
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-03 17:02:48 +01:00
ThibG
3efa0c54b6
Change custom emoji to be animated when hovering container ( #15637 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-31 21:25:31 +01:00
abcang
2319e85a8a
Fix react/jsx-no-duplicate-props ( #15636 )
2021-01-28 18:24:22 +01:00
ThibG
00e55445b9
[Glitch] Add “translate” class to other user strings
...
Port 5fcac81302
2021-01-26 14:05:24 +01:00
Claire
b81710c02c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Not a real conflict, glitch-soc quotes the upstream file, which has been
changed. Update the quote.
2021-01-26 14:01:30 +01:00
ThibG
5fcac81302
Add “translate” class to other user strings ( #15611 )
...
* Add “translate” class to other user strings
Follow-up to #15610 .
Allow Google Translate to work on more user content:
- poll options
- reply indicator (contents of the status being replied to)
- directory account cards
- account note in follow requests list
* Fix incorrect styling of account bio
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-22 10:09:23 +01:00
ThibG
c48e2a48ba
[Glitch] Fix Google Translate breaking web interface
...
Port 7d0031a515
2021-01-21 16:59:47 +01:00
Claire
f90fa11db5
Merge branch 'main' into glitch-soc/merge-upstream
2021-01-21 16:51:12 +01:00
ThibG
7d0031a515
Fix Google Translate breaking web interface ( #15610 )
...
- marks the page as a whole as untranslatable
- still marks user text as translatable
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-21 14:29:54 +01:00
ThibG
31e68bf3d3
[Glitch] Fix OCR lang data failing to load
...
Port 73ddb60c32
2021-01-11 12:00:26 +01:00
Claire
33d30632fb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Upstream refactored a bit, glitch-soc had specific code for local-only
statuses.
Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
ThibG
73ddb60c32
Fix OCR lang data failing to load ( #15519 )
...
Fixes #15472
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2021-01-09 03:48:50 +01:00
Takeshi Umeda
55e84f9125
[Glitch] Fix logo button style more
...
Port 3f4b0dfd47
2021-01-06 19:03:52 +01:00
Takeshi Umeda
7710a6c4b1
[Glitch] Fix logo button style
...
Port ba748a83f2
2021-01-06 19:03:21 +01:00
Takeshi Umeda
f3aa085af5
[Glitch] Fix getting-started footer in single column mode not being clickable in Safari
...
Port e38874dcf7
2021-01-06 18:38:10 +01:00
Takeshi Umeda
98fd0cca55
[Glitch] Fix defaultProps of frameRate to string
...
Port a50fe47a77
2021-01-06 18:32:37 +01:00
Takeshi Umeda
f17ff99257
[Glitch] Fix missing key in list timeline policy
...
Port 71f0968887
2021-01-06 18:23:44 +01:00
Claire
90528f43bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/configuration.js`:
Upstream updated the `js-yaml` dependency, which changed how to call it.
Those changes conflicted because that code is pretty different in glitch-soc
which has to deal with its more complex theming system.
Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
Not really a conflict, just glitch-soc-specific dependencies textually too
close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
Takeshi Umeda
a50fe47a77
Fix defaultProps of frameRate to string ( #15493 )
2021-01-05 20:00:42 +01:00
Takeshi Umeda
71f0968887
Fix missing key in list timeline policy ( #15494 )
2021-01-05 19:57:50 +01:00
Takeshi Umeda
e38874dcf7
Fix getting-started footer in single column mode not being clickable in Safari ( #15496 )
2021-01-05 19:57:32 +01:00
Takeshi Umeda
3f4b0dfd47
Fix logo button style more ( #15458 )
2020-12-30 23:18:39 +01:00
Takeshi Umeda
cb5bb2313b
Fix expand video on public page ( #15469 )
2020-12-30 23:18:11 +01:00
Eugen Rochko
4580129c98
New Crowdin updates ( #15413 )
...
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2020-12-26 23:51:46 +01:00
Takeshi Umeda
ba748a83f2
Fix logo button style ( #15428 )
...
* Fix bell button rtl style
* Remove size and style props from button component
* Fix logo button style
* Update jest snapshot
2020-12-26 23:50:34 +01:00
Takeshi Umeda
7e6d3a7d9a
Fix unfollow action button style ( #15418 )
2020-12-23 23:47:50 +01:00
