eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/views/accounts/_header.html.haml
7 years ago
f890d2a766
Support all ActivityPub actor types ( #6997 )
...
Fix #6973
7 years ago
33513753b9
Fix unpermitted parameters warning when generating pagination URLs ( #6995 )
7 years ago
123a343d11
[WIP] Enable custom emoji on account pages and in the sidebar ( #6124 )
...
Federate custom emojis with accounts
7 years ago
f464f98fd3
Update Ruby to version 2.4.4 ( #6964 )
...
https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/
> This release includes some bug fixes and some security fixes.
>
> - CVE-2017-17742: HTTP response splitting in WEBrick
> - CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir
> - CVE-2018-8777: DoS by large request in WEBrick
> - CVE-2018-8778: Buffer under-read in String#unpack
> - CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket
> - CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir
> - Multiple vulnerabilities in RubyGems
7 years ago
6a895e1ab3
Fix: Prevent submission using same logic as submit button disabling. ( #6993 )
...
This prevents submission through ctrl/cmd+enter when the submit button is disabled.
7 years ago
993ce0e5a7
improve zh-HK localization by referring zh-TW and zh-CN ( #6988 )
7 years ago
929f58f180
i18n: Update Polish translation ( #6985 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
b7d633c1bb
i18n: Add Japanese translations for domain blocks ( #6979 )
...
* run yarn manage:translations
* Update Japanese translations for domain blocks.
7 years ago
3886bfb5eb
[Nanobox] Enable ElasticSearch support by default ( #6977 )
...
Admins can still disable the feature by adding `ES_ENABLED=false` to their environment, if they prefer not to use it. Be sure to set the variable before you deploy!
7 years ago
fb3dc00dda
Ignore AbortError when cancelled sharing ( #6978 )
...
`navigator.share()` rejects Promise if user cancelled sharing, and it may
print it as an error on JavaScript console.
This patch ignores it and prints other errors on the console.
7 years ago
f0bb3ff533
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
01bad04efd
Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js
...
Add “public” pack to admin controller, as it is included in upstream …
7 years ago
3304cb681d
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui
...
Port #6628 to glitch-soc flavour
7 years ago
257146c960
Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes
...
Backport dropdown menu fixes from Mastodon
7 years ago
9248d1e3a7
Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page
...
Fix migration page style
7 years ago
b305e7452a
Add “public” pack to admin controller, as it is included in upstream admin layout
...
Fixes CW unfolding in moderation
7 years ago
e573bb0990
Fix compatibility with PeerTube ( #6968 )
...
* Support fetching objects of convertible types by URL (fixes #6924 )
* Ignore invalid hashtags
7 years ago
167a2ecde0
Fix migration page style
7 years ago
48bcf4d6e8
[Glitch] Remove pointer events on the entire UI when a dropdown menu is open
...
Port 913a38111f
7 years ago
a6c129ddbd
Add some UI for user-defined domain blocks ( #6628 )
...
* Keep list of blocked domains
Might be overkill, but I'm trying to follow the same logic as for blocked users
* Add basic domain block UI
* Add the domain blocks UI to Getting Started
* Fix undefined URL in `fetchDomainBlocks`
* Update all known users' domain_blocking relationship instead of just one's
7 years ago
2871a82fcc
[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport
...
Port f6a8d835d3
7 years ago
218cc261d1
Add the domain blocks UI to Getting Started Misc
7 years ago
afa813d71f
Add basic domain block UI
7 years ago
482ad7d7c4
Keep list of blocked domains
...
Might be overkill, but I'm trying to follow the same logic as for blocked users
7 years ago
79da0ad7a2
Update all known users' domain_blocking relationship instead of just one's
7 years ago
937ace10d9
Fix undefined URL in `fetchDomainBlocks`
7 years ago
47cee7cc8e
Upgrade charlock_holmes to version 0.7.6 ( #6966 )
...
This version fixes compilation errors when trying to build its native extension with ICU 61.
7 years ago
947eedcab2
update ja locale ( #6965 )
...
related https://github.com/tootsuite/mastodon/pull/6956
7 years ago
d1f34151ae
Feature: Direct message from menu ( #6956 )
...
* Implement ability to send direct messages from the user menu
* Implement message warning users that direct messages are visible to all mentioned users
* Update locales
7 years ago
1bd12cf8eb
Merge pull request #404 from ThibG/glitch-soc/features/moved-note
...
[Untested] [Glitch] Profile redirect notes
7 years ago
b5948044b3
[Glitch] Display unfollow button even if account moved
...
Backport 3987bd18a4
7 years ago
a59c146bf8
[Glitch] Profile redirect notes
...
Port WebUI changes from 58cede4808
7 years ago
f1f846045f
Fix ReferenceError when Cache API is missing ( #6953 )
...
Cache API is not supported on Safari 11.0 / iOS 11.
Since those caching is optional, this patch simply ignores it.
7 years ago
41452e8302
Fix TypeError on follow notification ( #6950 )
...
`notification.status` may not be present, e.g. follow notification.
7 years ago
9ed5eebd7c
Do not ignore unknown media attachments, only skip them ( #6948 )
...
That way, they are displayed in a list below the corresponding toot.
7 years ago
4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents
...
Render toots with empty contents
7 years ago
d37a79adce
Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup
...
Fix attachment lists
7 years ago
7db431eac6
Fix attachment lists
7 years ago
53eab4470d
Render toots with empty contents
...
This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon.
7 years ago
5021c4e9ca
Add double-tap zoom functionary to `ZoomableImage` ( #6944 )
...
add <div.zoomable-image__margin/> to keep margin of the image on zooming
move setting `scrollLeft` and `scrollTop` of container from callback of
`setState` to `componentDidUpdate`
add 'hammerjs' package for touch gesture detection
rewrite `ZoomableImage` using 'hammerjs'
7 years ago
4f9136d2d5
Document CORS requirement for asset host ( #6941 )
7 years ago
1ed9500b52
Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
...
Remove ignored 'u' parameter on regexp (#392 )
7 years ago
d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
49c957bc3b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
21b586436e
Remove ignored 'u' parameter on regexp ( #392 )
7 years ago
f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
7 years ago
6af17b79c5
Merge pull request #399 from ThibG/glitch-soc/features/attachments-list
...
Port attachment lists to glitch-soc flavour
7 years ago
3523aa440b
Fix LoadMore on account media gallery ( #6933 )
...
max_id in the fetch request should be a status id, but media attachment id was used.
7 years ago
88790b91de
[Glitch] Display AttachmentList in notifications
...
Port 77406d3a09
7 years ago
David Yip
Eugen Rochko
David Underwood
Yamagishi Kazutoshi
Emelia Smith
luzi82
Marcin Mikołajczak
mayaeh
Daniel Hunsaker
unarist
Jenkins
beatrix
Thibaut Girka
Pierre-Morgan Gate
takayamaki
Yuto Tokunaga
Akihiko Odaki
Rey Tucker