Commit graph

39673 commits

Author SHA1 Message Date
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
Pierre-Morgan Gate
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.
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
takayamaki
947eedcab2 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
Emelia Smith
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
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
David Yip
1bd12cf8eb
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
b5948044b3 [Glitch] Display unfollow button even if account moved
Backport 3987bd18a4 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
Thibaut Girka
a59c146bf8 [Glitch] Profile redirect notes
Port WebUI changes from 58cede4808
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
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.
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
unarist
41452e8302 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
ThibG
9ed5eebd7c 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
4e45954280
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
David Yip
d37a79adce
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
7db431eac6 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
Thibaut Girka
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.
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
Yuto Tokunaga
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'
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
Akihiko Odaki
4f9136d2d5 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
1ed9500b52
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
d2cdc2b5a3
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
David Yip
49c957bc3b
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
Rey Tucker
21b586436e 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
f61aa8e0f7
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
David Yip
6af17b79c5
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
unarist
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.
2018-03-27 16:53:52 +02:00
Thibaut Girka
8fc7f85356 [Glitch] Display AttachmentList in notifications
Port 2cb19bf443 to glitch-soc
2018-03-27 16:09:33 +02:00
Thibaut Girka
88790b91de [Glitch] Display AttachmentList in notifications
Port 77406d3a09 to glitch-soc
2018-03-27 16:09:33 +02:00
Thibaut Girka
9454cfc0ad [Glitch] Display AttachmentList in timelines in compact style when media missing
Port 5079c1e322 to glitch-soc
2018-03-27 16:09:27 +02:00
Thibaut Girka
3bc5452449 [Glitch] Display AttachmentList in timelines in compact style when media missing
Port 86a9de6753 to glitch-soc
2018-03-27 16:09:27 +02:00
unarist
cfd1fe74c9 Clone response before put it to the cache (#6932)
`Response.prototype.clone()` must be called before the response used.

This fixes an error from ServiceWorker and failing to load image when the
image is not cached.
2018-03-27 15:18:35 +02:00
unarist
f5ed5f3860 Clone response before put it to the cache (#6932)
`Response.prototype.clone()` must be called before the response used.

This fixes an error from ServiceWorker and failing to load image when the
image is not cached.
2018-03-27 15:18:35 +02:00