851aa5f313
Merge pull request #410 from ThibG/glitch-soc/fixes/compose-disable
...
[Glitch] Fix: Prevent submission using same logic as submit button disabling
7 years ago
e1e4a53496
[Glitch] Fix: Prevent submission using same logic as submit button disabling.
...
Port 7d791f494b
7 years ago
21394c5462
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
40afedc030
Support all ActivityPub actor types ( #6997 )
...
Fix #6973
7 years ago
10fc551576
Fix unpermitted parameters warning when generating pagination URLs ( #6995 )
7 years ago
44274257de
[WIP] Enable custom emoji on account pages and in the sidebar ( #6124 )
...
Federate custom emojis with accounts
7 years ago
1fbeac0c82
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
7d791f494b
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
3233c46796
improve zh-HK localization by referring zh-TW and zh-CN ( #6988 )
7 years ago
9458e263d5
i18n: Update Polish translation ( #6985 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
e0046b2c13
i18n: Add Japanese translations for domain blocks ( #6979 )
...
* run yarn manage:translations
* Update Japanese translations for domain blocks.
7 years ago
9eb4735e0a
[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
11fb748041
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
658440838b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
a7cd93032e
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
766a008931
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui
...
Port #6628 to glitch-soc flavour
7 years ago
0f8f4969bd
Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes
...
Backport dropdown menu fixes from Mastodon
7 years ago
1612cbd150
Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page
...
Fix migration page style
7 years ago
e282d19700
Add “public” pack to admin controller, as it is included in upstream admin layout
...
Fixes CW unfolding in moderation
7 years ago
1cda8b247a
Fix compatibility with PeerTube ( #6968 )
...
* Support fetching objects of convertible types by URL (fixes #6924 )
* Ignore invalid hashtags
7 years ago
f7d23998c8
Fix migration page style
7 years ago
769c536db4
[Glitch] Remove pointer events on the entire UI when a dropdown menu is open
...
Port 95fce1bca0
7 years ago
aa4a16c94f
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
caa6611877
[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport
...
Port 27b532cc98
7 years ago
957d5c36c7
Add the domain blocks UI to Getting Started Misc
7 years ago
d2b9747a50
Add basic domain block UI
7 years ago
38feef43ad
Keep list of blocked domains
...
Might be overkill, but I'm trying to follow the same logic as for blocked users
7 years ago
e47593cac8
Update all known users' domain_blocking relationship instead of just one's
7 years ago
876cc5c02b
Fix undefined URL in `fetchDomainBlocks`
7 years ago
ccacb263da
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
43ab4a3985
update ja locale ( #6965 )
...
related https://github.com/tootsuite/mastodon/pull/6956
7 years ago
df62fc20bf
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
bc51e7509b
Merge pull request #404 from ThibG/glitch-soc/features/moved-note
...
[Untested] [Glitch] Profile redirect notes
7 years ago
32ede640af
[Glitch] Display unfollow button even if account moved
...
Backport 1a90ef9c25
7 years ago
f63450c7ec
[Glitch] Profile redirect notes
...
Port WebUI changes from b89f614bd7
7 years ago
2974df3c2f
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
5a9c8aeb42
Fix TypeError on follow notification ( #6950 )
...
`notification.status` may not be present, e.g. follow notification.
7 years ago
f7a96189b6
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
299cfa4bc7
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents
...
Render toots with empty contents
7 years ago
998a2eff76
Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup
...
Fix attachment lists
7 years ago
166fe6e6dd
Fix attachment lists
7 years ago
4975cee02f
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
7551951094
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
aec3ebab81
Document CORS requirement for asset host ( #6941 )
7 years ago
e6e537d002
Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
...
Remove ignored 'u' parameter on regexp (#392 )
7 years ago
2567d0a704
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
1bf0a6548c
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
b65fc60334
Remove ignored 'u' parameter on regexp ( #392 )
7 years ago
7cdf2b05b6
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
7 years ago
9f55021e7e
Merge pull request #399 from ThibG/glitch-soc/features/attachments-list
...
Port attachment lists to glitch-soc flavour
7 years ago
David Yip
Thibaut Girka
Eugen Rochko
David Underwood
Yamagishi Kazutoshi
Emelia Smith
luzi82
Marcin Mikołajczak
mayaeh
Daniel Hunsaker
unarist
Jenkins
beatrix
Pierre-Morgan Gate
takayamaki
Yuto Tokunaga
Akihiko Odaki
Rey Tucker