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
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
d8a0c19166
Fix XML oEmbed support discovery ( #6104 )
2017-12-27 03:29:49 +01:00
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
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
4d2ca09ae8
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
c670d2cadd
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
ccc14ad59b
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
44d1b30dfb
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
f9863df926
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
4a0dd0efea
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
ab81f8414d
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
0a2cc2361c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-26 18:17:16 +00:00
e2ccf65789
add ruby-progressbar to gemfile ( fixes #6110 ) ( #6111 )
2017-12-26 18:43:52 +01:00
2a2ac6c744
more faster index on notifications table ( #6108 )
2017-12-26 17:56:31 +01:00
15796d0b5f
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
61aa7a385b
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
2bd6532e63
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-25 20:17:10 +00:00
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
b4047027d4
Additional prop name change. ( #6098 )
2017-12-26 00:14:06 +09:00
4d91c45ce1
Add supported Node.js version to package.json ( #6096 )
2017-12-25 15:02:07 +01:00
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
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
fad20b7830
Add validation for onMuteNotifications ( #6092 )
...
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
* Add validation for onMuteNotifications
2017-12-24 17:18:45 +09:00
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
2017-12-24 04:48:31 +01:00
3f52d12a4c
Refactor web_push_subscription ( #6047 )
...
* Remove onSave method in mapped properties for column_settings
* Make web_push_subscription.register an action
2017-12-24 04:47:35 +01:00
65cabbe8ef
removed references to hideOnMobile in column_link and getting_started ( #6082 )
...
* removed references to hideOnMobile in column_link and getting_started
* move keyboard shortcuts back below blocked users
2017-12-24 04:47:02 +01:00
7f1828166d
Move dropdown transform origin to top edge ( #6091 )
2017-12-24 00:53:03 +01:00
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
30f0615be2
Merge pull request #280 from KnzkDev/add-en-ja
...
i18n: Add en and ja
2017-12-21 22:49:30 -05:00
33f2976c84
Update and add some translate
2017-12-22 12:22:41 +09:00
0d900416f7
Add more en and ja
2017-12-22 12:11:28 +09:00
43b9a78f1d
Add en and ja
2017-12-22 12:01:38 +09:00
e921778dd3
enforce LOCAL_HTTPS=true in production ( #6061 )
...
* enforce https in production
* note changes in production env sample
* typo fix
2017-12-22 02:17:59 +01:00
7eb2f42976
Reduce the number of synchronous resolves when posting toots ( #6075 )
2017-12-22 02:15:08 +01:00
87ee458079
Display deleted users' role as “Suspended” ( #6080 )
...
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
2017-12-22 02:14:17 +01:00
9ba54d457a
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
2017-12-21 18:47:07 -05:00
856ad57421
Merge pull request #278 from KnzkDev/fix/acc-header-avatar
...
Fix account header avatar
2017-12-21 17:46:53 -05:00
4c682228ce
Fix account header avatar
2017-12-22 07:12:49 +09:00
8f8e4d5c92
Merge pull request #277 from glitch-soc/273-add-data-status-by-to-detailed-status
...
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 16:10:36 -05:00
d93f6b4720
Add data-status-by back to DetailedStatus component. Fixes #273 .
2017-12-21 13:22:33 -06:00
f923aeec08
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
2017-12-21 13:04:40 -06:00
d9af646f88
remove themes.default from i18n-tasks unused check
2017-12-21 12:45:11 -06:00
f42aa942b4
Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab
...
Wrap <Avatar> in account header in a link to that account's page (fixes #245 )
2017-12-21 08:30:22 -05:00
894e9747b7
Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
...
Set packs on 2FA-related pages. Fixes #271 .
2017-12-21 08:30:05 -05:00
c94a497ef6
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
2017-12-21 05:25:16 -06:00
136bc872b3
Remove themes.default from i18n-tasks unused check
...
This translation key comes in from tootsuite, but the flavours system
does not use it.
2017-12-21 05:24:17 -06:00
df1478e313
Remove unused themes.default key in ko locale.
2017-12-20 20:02:50 -06:00
ca77c18c24
add keyboard shortcuts to getting started ( fixes #275 )
2017-12-20 09:50:29 -06:00
ea1c58f6d8
Set packs on 2FA-related pages. Fixes #271 .
...
Specifically, this commit:
- changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from
S::BaseController, because this gives us the necessary actions and
packs
- prepends set_pack to Auth::SessionsController's action chain so that
it takes effect in time for render :two_factor
2017-12-20 03:15:54 -06:00
David Yip