Thibaut Girka
3d722b0c4e
Fix settings modal
6 years ago
Thibaut Girka
08afd6b69c
Do not leak local-only toots to remote mentioned users
6 years ago
Thibaut Girka
2db0506226
Load custom CSS rules after standard ones
...
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
6 years ago
Thibaut Girka
27e8354914
Add support for lists in statuses
6 years ago
Thibaut Girka
659f972bed
Do not switch to italic for status media buttons
6 years ago
Thibaut Girka
2e3640ecbb
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
6 years ago
ThibG
91a74ea86b
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
kedama
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
to glitch-soc
6 years ago
Thibaut Girka
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
6 years ago
Thibaut Girka
c3fa4e8e07
Fix ReferenceError in dropdown
6 years ago
Thibaut Girka
d779ec1f0e
Fix broken reference to handleSubmit
6 years ago
Thibaut Girka
e949861176
Cleanup
6 years ago
Thibaut Girka
faff152ae5
Move ComposerPublisher to Compose
6 years ago
Thibaut Girka
df951c319c
Add OptionsContainer
6 years ago
Thibaut Girka
14028655df
Move composer Dropdown from features/composer to features/compose
6 years ago
Thibaut Girka
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
6 years ago
Thibaut Girka
47faf47ed5
ComposerTextarea → AutosuggestTextarea
6 years ago
Thibaut Girka
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
Thibaut Girka
c5f49a92dc
Move PollForm from features/composer to features/compose
6 years ago
Thibaut Girka
f1a22e33e2
Inline spoiler input
6 years ago
Thibaut Girka
8fd599fb40
ComposerReply → ReplyIndicator
6 years ago
Thibaut Girka
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
Thibaut Girka
1bc4b8a0a5
features/composer/index.js → ComposeForm
6 years ago
Thibaut Girka
281a82d878
DrawerHeader → Header + HeaderContainer
6 years ago
Thibaut Girka
9a2f10fe8b
DrawerAccount → NavigationBar + NavigationContainer
6 years ago
Eugen Rochko
9b9816aba6
[Glitch] Show suggested follows on search screen in mobile layout
...
Port ad510db3a1
to glitch-soc
6 years ago
Thibaut Girka
149aa07409
DrawerResults → SearchResults + SearchResultsContainer
6 years ago
Thibaut Girka
67771e6d65
Rework DrawerResults to make them closer to upstream
6 years ago
Thibaut Girka
ab3e8fc542
Move DrawerSearch to Search + SearchContainer
6 years ago
Thibaut Girka
c92ab35b19
Inline DrawerSearchPopout in DrawerSearch
6 years ago
Thibaut Girka
c19b983986
Refactor a bit DrawerSearch to make it closer to upstream
6 years ago
Thibaut Girka
eed2c9dd44
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
6 years ago
dependabot[bot]
fd9f5a467f
Bump aws-sdk-s3 from 1.36.0 to 1.36.1 ( #10618 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.36.0 to 1.36.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.0...v1.36.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
5c34163dbc
Bump doorkeeper from 5.0.2 to 5.1.0 ( #10598 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ThibG
0e78862b61
Allow switching between singe-option and multiple-option polls ( #10603 )
6 years ago
kedama
d763d39d26
Fix modal items cannot scroll on touch devices ( #10605 )
6 years ago
ThibG
bdec58b514
Minor code cleanup ( #10613 )
6 years ago
dependabot[bot]
c9441bf82e
Bump cld3 from 3.2.3 to 3.2.4 ( #10617 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
marcin mikołajczak
46321dc993
i18n: Fix misleading strings in Polish translation ( #10615 )
6 years ago
jeroenpraat
cf5414e5d3
Small fix Dutch translation ( #10612 )
...
* Small fix Dutch translation
* Better descriptive titles
See #10611
6 years ago
Yamagishi Kazutoshi
a430f2a03e
i18n: Update Catalan translation ( #10559 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
6 years ago
Ben Lubar
be8692b938
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs ( #10565 )
6 years ago
Yamagishi Kazutoshi
80c9cb0eb3
Add hi.json ( #10573 )
6 years ago
dependabot[bot]
aa484e2cb3
Bump webpush from 0.3.7 to 0.3.8 ( #10592 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
a5c0aae984
Bump lograge from 0.10.0 to 0.11.0 ( #10588 )
...
Bumps [lograge](https://github.com/roidrage/lograge ) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/roidrage/lograge/releases )
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
partev
d210d0a655
Update hy.json ( #10591 )
6 years ago
Daniel Aleksandersen
10bdd912d6
Treat meta[property] as a space-separated list ( #10604 )
...
The @property attribute in HTML is a space-separated list of values.
This change normalizes whitespace and finds the desired value in
the list instead of requiring an exact single-value match.
More details:
https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html
6 years ago
Jessica
01b1c377b1
Animate avatar GIFs on-hover on public profiles ( #10549 )
...
* Third time is the charm?
* Use full asset URL for data-static and data-original
̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
6 years ago
jeroenpraat
951f8d5b44
Update NL (Dutch) translation ( #10601 )
...
* Update NL language strings
Have to do it this way, cause this file is locked on Weblate
* fix
* Update simple_form.nl.yml
* Update nl.yml
6 years ago
ThibG
6e620dcab1
Use correct local names for fonts ( #10594 )
6 years ago