MitarashiDango
511c6f9625
bug fix (WebPush does not work) ( #6120 )
2017-12-28 16:20:34 +01:00
cwm
485dbbb9b7
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
cwm
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
ThibG
3df85a843c
Make host_meta/webfinger replies cacheable ( fixes #6100 ) ( #6101 )
...
* Make host_meta/webfinger replies cacheable (fixes #6100 )
Drop common code for handling users and sessions as webfinger queries
are very basic, public APIs.
Also explicitly mark results as cacheable with “expires_in”.
* Add “Vary: Accept” header for caching since content-negociation is used
2017-12-27 18:21:12 +01:00
ThibG
868568d1c1
Make host_meta/webfinger replies cacheable ( fixes #6100 ) ( #6101 )
...
* Make host_meta/webfinger replies cacheable (fixes #6100 )
Drop common code for handling users and sessions as webfinger queries
are very basic, public APIs.
Also explicitly mark results as cacheable with “expires_in”.
* Add “Vary: Accept” header for caching since content-negociation is used
2017-12-27 18:21:12 +01:00
David Yip
f722fcb5a6
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
2017-12-26 22:24:19 -06:00
David Yip
7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
2017-12-26 22:24:19 -06:00
Akihiko Odaki
093af89c43
Move the mastodon on Getting Started column to drawer column ( #6109 )
...
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
2017-12-27 03:31:30 +01:00
Akihiko Odaki
65f30f65a2
Move the mastodon on Getting Started column to drawer column ( #6109 )
...
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
2017-12-27 03:31:30 +01:00
Akihiko Odaki
d8a0c19166
Fix XML oEmbed support discovery ( #6104 )
2017-12-27 03:29:49 +01:00
Akihiko Odaki
e0ef7f9d79
Fix XML oEmbed support discovery ( #6104 )
2017-12-27 03:29:49 +01:00
beatrix
dde1db7efb
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
2017-12-26 17:03:29 -05:00
beatrix
7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
2017-12-26 17:03:29 -05:00
beatrix
f54cd50e4c
Merge pull request #285 from chriswmartin/detailed-status-actions
...
Add mute, block, conversation mute actions to detailed status dropdown
2017-12-26 17:03:00 -05:00
beatrix
e6ab869d95
Merge pull request #285 from chriswmartin/detailed-status-actions
...
Add mute, block, conversation mute actions to detailed status dropdown
2017-12-26 17:03:00 -05:00
cwm
4d2ca09ae8
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
cwm
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
cwm
c670d2cadd
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
cwm
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
cwm
ccc14ad59b
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
cwm
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
cwm
44d1b30dfb
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
cwm
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
cwm
f9863df926
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
cwm
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
cwm
4a0dd0efea
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
cwm
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
cwm
ab81f8414d
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
cwm
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
Jenkins
0a2cc2361c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-26 18:17:16 +00:00
Jenkins
6b85dba8da
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-26 18:17:16 +00:00
beatrix
e2ccf65789
add ruby-progressbar to gemfile ( fixes #6110 ) ( #6111 )
2017-12-26 18:43:52 +01:00
beatrix
127bfda521
add ruby-progressbar to gemfile ( fixes #6110 ) ( #6111 )
2017-12-26 18:43:52 +01:00
takayamaki
2a2ac6c744
more faster index on notifications table ( #6108 )
2017-12-26 17:56:31 +01:00
takayamaki
1494509468
more faster index on notifications table ( #6108 )
2017-12-26 17:56:31 +01:00
cwm
15796d0b5f
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
cwm
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
cwm
61aa7a385b
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
cwm
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
Jenkins
2bd6532e63
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-25 20:17:10 +00:00
Jenkins
bed13f22e2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-25 20:17:10 +00:00
Chris
1f0ae8d173
Add mute, block, conversation mute actions to detailed status dropdown menu ( #6099 )
...
* removed references to hideOnMobile in column_link and getting_started
* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226 )
* remove unused withDismiss in detailed status
2017-12-25 20:56:05 +01:00
Chris
1e5d1fa5c8
Add mute, block, conversation mute actions to detailed status dropdown menu ( #6099 )
...
* removed references to hideOnMobile in column_link and getting_started
* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226 )
* remove unused withDismiss in detailed status
2017-12-25 20:56:05 +01:00
MitarashiDango
b4047027d4
Additional prop name change. ( #6098 )
2017-12-26 00:14:06 +09:00
MitarashiDango
a3b369337f
Additional prop name change. ( #6098 )
2017-12-26 00:14:06 +09:00
Yamagishi Kazutoshi
4d91c45ce1
Add supported Node.js version to package.json ( #6096 )
2017-12-25 15:02:07 +01:00
Yamagishi Kazutoshi
43c37a4768
Add supported Node.js version to package.json ( #6096 )
2017-12-25 15:02:07 +01:00
Jenkins
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
Jenkins
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
Eugen Rochko
50f2d69780
Add rake task to check and purge accounts that are missing in origin ( #6085 )
...
* Add rake task to check and purge accounts that are missing in origin
* Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts
2017-12-24 16:14:33 +01:00