me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6119 commits 2 branches 0 tags 429 MiB
Commit graph

6119 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
e1e4a53496 [Glitch] Fix: Prevent submission using same logic as submit button disabling. 
Port 7d791f494b to glitch-soc
 2018-04-02 20:04:18 +02:00
David Yip
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
 2018-04-01 20:24:50 -05:00
Eugen Rochko
40afedc030 Support all ActivityPub actor types (#6997) 
Fix #6973
 2018-04-02 02:10:53 +02:00
Eugen Rochko
10fc551576 Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
David Underwood
44274257de [WIP] Enable custom emoji on account pages and in the sidebar (#6124) 
Federate custom emojis with accounts
 2018-04-01 23:55:42 +02:00
Yamagishi Kazutoshi
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
 2018-04-01 23:43:08 +02:00
Emelia Smith
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.
 2018-04-01 22:19:43 +02:00
luzi82
3233c46796 improve zh-HK localization by referring zh-TW and zh-CN (#6988) 2018-04-01 21:57:26 +09:00
Marcin Mikołajczak
9458e263d5 i18n: Update Polish translation (#6985) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-01 10:31:38 +02:00
mayaeh
e0046b2c13 i18n: Add Japanese translations for domain blocks (#6979) 
* run yarn manage:translations

* Update Japanese translations for domain blocks.
 2018-03-31 21:09:39 +09:00
Daniel Hunsaker
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!
 2018-03-31 13:17:25 +02:00
unarist
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.
 2018-03-31 13:16:38 +02:00
Jenkins
658440838b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00
beatrix
a7cd93032e Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js 
Add “public” pack to admin controller, as it is included in upstream …
 2018-03-30 14:50:19 -04:00
beatrix
766a008931 Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui 
Port #6628 to glitch-soc flavour
 2018-03-30 14:50:02 -04:00
David Yip
0f8f4969bd Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes 
Backport dropdown menu fixes from Mastodon
 2018-03-30 11:29:26 -05:00
David Yip
1612cbd150 Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page 
Fix migration page style
 2018-03-30 11:27:57 -05:00
Thibaut Girka
e282d19700 Add “public” pack to admin controller, as it is included in upstream admin layout 
Fixes CW unfolding in moderation
 2018-03-30 18:16:47 +02:00
ThibG
1cda8b247a Fix compatibility with PeerTube (#6968) 
* Support fetching objects of convertible types by URL (fixes #6924)

* Ignore invalid hashtags
 2018-03-30 15:44:54 +02:00
Thibaut Girka
f7d23998c8 Fix migration page style 2018-03-30 15:26:12 +02:00
Thibaut Girka
769c536db4 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open 
Port 95fce1bca0 to glitch-soc
 2018-03-30 12:45:23 +02:00
ThibG
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
 2018-03-30 12:38:00 +02:00
Thibaut Girka
caa6611877 [Glitch] Place dropdown menu top if it is closer to the bottom of the viewport 
Port 27b532cc98 to glitch-soc
 2018-03-30 12:31:29 +02:00
Thibaut Girka
957d5c36c7 Add the domain blocks UI to Getting Started Misc 2018-03-30 10:07:33 +02:00
Thibaut Girka
d2b9747a50 Add basic domain block UI 2018-03-30 10:07:33 +02:00
Thibaut Girka
38feef43ad Keep list of blocked domains 
Might be overkill, but I'm trying to follow the same logic as for blocked users
 2018-03-30 10:07:33 +02:00
Thibaut Girka
e47593cac8 Update all known users' domain_blocking relationship instead of just one's 2018-03-30 10:07:33 +02:00
Thibaut Girka
876cc5c02b Fix undefined URL in fetchDomainBlocks 2018-03-30 10:07:33 +02:00
Pierre-Morgan Gate
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.
 2018-03-30 09:52:44 +02:00
takayamaki
43ab4a3985 update ja locale (#6965) 
related https://github.com/tootsuite/mastodon/pull/6956
 2018-03-30 10:04:04 +09:00
Emelia Smith
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
 2018-03-29 19:08:34 +02:00
David Yip
bc51e7509b Merge pull request #404 from ThibG/glitch-soc/features/moved-note 
[Untested] [Glitch] Profile redirect notes
 2018-03-29 09:26:31 -05:00
Thibaut Girka
32ede640af [Glitch] Display unfollow button even if account moved 
Backport 1a90ef9c25 to glitch-soc
 2018-03-29 14:59:20 +02:00
Thibaut Girka
f63450c7ec [Glitch] Profile redirect notes 
Port WebUI changes from b89f614bd7
 2018-03-29 14:59:20 +02:00
unarist
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.
 2018-03-29 14:57:02 +02:00
unarist
5a9c8aeb42 Fix TypeError on follow notification (#6950) 
`notification.status` may not be present, e.g. follow notification.
 2018-03-29 12:59:12 +02:00
ThibG
f7a96189b6 Do not ignore unknown media attachments, only skip them (#6948) 
That way, they are displayed in a list below the corresponding toot.
 2018-03-29 00:52:24 +02:00
David Yip
299cfa4bc7 Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents 
Render toots with empty contents
 2018-03-28 16:39:12 -05:00
David Yip
998a2eff76 Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup 
Fix attachment lists
 2018-03-28 16:38:53 -05:00
Thibaut Girka
166fe6e6dd Fix attachment lists 2018-03-28 22:19:36 +02:00
Thibaut Girka
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.
 2018-03-28 21:13:45 +02:00
Yuto Tokunaga
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'
 2018-03-28 20:40:51 +02:00
Akihiko Odaki
aec3ebab81 Document CORS requirement for asset host (#6941) 2018-03-28 20:40:18 +02:00
David Yip
e6e537d002 Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter 
Remove ignored 'u' parameter on regexp (#392)
 2018-03-27 13:06:28 -05:00
David Yip
2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
David Yip
1bf0a6548c Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-03-27 10:41:18 -05:00
Rey Tucker
b65fc60334 Remove ignored 'u' parameter on regexp (#392) 2018-03-27 11:30:49 -04:00
David Yip
7cdf2b05b6 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb
 2018-03-27 10:26:47 -05:00
David Yip
9f55021e7e Merge pull request #399 from ThibG/glitch-soc/features/attachments-list 
Port attachment lists to glitch-soc flavour
 2018-03-27 10:20:52 -05:00
unarist
2111defbbf Fix LoadMore on account media gallery (#6933) 
max_id in the fetch request should be a status id, but media attachment id was used.
 2018-03-27 16:53:52 +02:00