b2f73231a4
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
4ce6358787
[Glitch] Fix modal items cannot scroll on touch devices
...
Port 92ced1e94b
5 years ago
6f85bb754b
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
5 years ago
1b8d2af1f9
Fix ReferenceError in dropdown
5 years ago
25cfabce26
Fix broken reference to handleSubmit
5 years ago
041e27bd2d
Cleanup
5 years ago
2ee26ba420
Move ComposerPublisher to Compose
5 years ago
bf8b0394b7
Add OptionsContainer
5 years ago
ef17da32f9
Move composer Dropdown from features/composer to features/compose
5 years ago
a6bb49adf1
Move ComposerTextareaIcons to TextareaIcons
5 years ago
08faf16d66
ComposerTextarea → AutosuggestTextarea
5 years ago
513547ba57
ComposerUploadForm → UploadForm + UploadFormContainer
5 years ago
f7d1772fc8
Move PollForm from features/composer to features/compose
5 years ago
2021f14e8f
Inline spoiler input
5 years ago
3529f6f4ae
ComposerReply → ReplyIndicator
5 years ago
ad6166f0ef
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
5 years ago
5e4588524b
features/composer/index.js → ComposeForm
5 years ago
8ea0e64864
DrawerHeader → Header + HeaderContainer
5 years ago
2f2381a400
DrawerAccount → NavigationBar + NavigationContainer
5 years ago
7acc035cbe
[Glitch] Show suggested follows on search screen in mobile layout
...
Port 541fda5fc8
5 years ago
4aee182cd3
DrawerResults → SearchResults + SearchResultsContainer
5 years ago
7c2cc9d681
Rework DrawerResults to make them closer to upstream
5 years ago
5264424b71
Move DrawerSearch to Search + SearchContainer
5 years ago
7fa3320516
Inline DrawerSearchPopout in DrawerSearch
5 years ago
a55e1c1d49
Refactor a bit DrawerSearch to make it closer to upstream
5 years ago
e41c4ad61b
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
5 years ago
e9cae29819
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>
5 years ago
824a8598ce
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>
5 years ago
eb80c3924f
Allow switching between singe-option and multiple-option polls ( #10603 )
5 years ago
92ced1e94b
Fix modal items cannot scroll on touch devices ( #10605 )
5 years ago
3c6f8de45a
Minor code cleanup ( #10613 )
5 years ago
6d259cc9cd
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>
5 years ago
ebd171eb0f
i18n: Fix misleading strings in Polish translation ( #10615 )
5 years ago
5205009df6
Small fix Dutch translation ( #10612 )
...
* Small fix Dutch translation
* Better descriptive titles
See #10611
5 years ago
a59d2e0926
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
483aa50856
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs ( #10565 )
6 years ago
47c0af88f1
Add hi.json ( #10573 )
6 years ago
df02f5b148
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
4031cce0a5
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
fe19e9d7b1
Update hy.json ( #10591 )
6 years ago
e3dda38c8b
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
d7c34fb945
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
f7cc05db80
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
1fecdb013a
Use correct local names for fonts ( #10594 )
6 years ago
1af37e09f3
Configrationable repository url ( #10600 )
...
* config: Add GITHUB_REPOSITORY for repository name
* config: Add SOURCE_BASE_URL for repository url
* Show source_url and repository name on getting started
6 years ago
3316cc1722
Merge pull request #998 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
2da3b24eb8
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port a6fe7ae53c
6 years ago
3673665b46
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
707ae5d37a
Add forgotten text
6 years ago
3f40442f49
Fix keybase indication on dashboard
6 years ago
ThibG
kedama
Eugen Rochko
dependabot[bot]
marcin mikołajczak
jeroenpraat
Yamagishi Kazutoshi
Ben Lubar
partev
Daniel Aleksandersen
Jessica
Sho Kusano