f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl
...
i18n: 🇵🇱
2018-01-05 12:36:53 -05:00
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-04 23:17:11 +00:00
d872902997
Small translation fixes for Serbian (and sr@Latn too) ( #6188 )
2018-01-05 00:16:06 +01:00
49e296e1b0
Fix overflowing audit logs ( #6184 )
2018-01-04 19:38:46 +01:00
0f69a90588
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-04 14:42:58 +01:00
89daeb43a8
Improve Traditional Chinese translation ( #6166 )
...
* Improve Traditional Chinese translations
* Sort alphabetically
2018-01-04 05:00:50 +01:00
256c2b1de0
Rearrange items in Getting Started navigation ( #6126 )
...
Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)
This fixes the issue by rearranging.
2018-01-04 10:56:54 +09:00
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 20:17:13 +00:00
d907d4352e
l10n OC language ( #6169 )
...
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
2018-01-03 21:05:54 +01:00
53d99ebf4f
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-03 22:45:24 +09:00
1001922156
Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 ( #6167 )
...
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
2018-01-03 21:00:39 +09:00
933840bebf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 04:17:11 +00:00
2471796d75
Set background to the navigation of Getting Started column ( #6163 )
...
The background of the navigation matters because its scrollbar is
transparent.
2018-01-03 04:39:14 +01:00
94230fe565
Fix newlines-to-spaces functionality ( #6158 )
...
yay for regexes, amirite
2018-01-02 19:35:24 +01:00
b6af88192f
Display a warning when composing unlisted toots with something looking like a hashtag ( #6132 )
2018-01-02 14:24:52 +01:00
3ba7cde38d
Rename key to path in actions and reducers for settings ( #6105 )
2018-01-02 13:50:54 +01:00
21b9da6418
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2018-01-02 20:39:12 +09:00
fa768abf5c
More ../ -> ~.
2018-01-02 00:26:44 -06:00
54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
764f876953
Use const instead of let for constant ( #6106 )
2018-01-02 13:28:49 +09:00
2c1ed5f872
Show mastodon on modal ( #6129 )
2018-01-02 05:07:56 +01:00
fa9b7ece2e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-31 09:17:15 +00:00
7d376e41be
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
d817c0a958
Merge pull request #291 from glitch-soc/merge-upstream
...
Merge with upstream @ f4b80e6511
2017-12-30 18:24:38 -06:00
4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
e4944d065b
Switch to tootsuite's elephant friend for the drawer
...
This version has a transparent background, which works better with the
wave.
2017-12-30 17:17:37 -06:00
513d982f29
Use ~ notation in components for image references
...
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
2017-12-30 17:15:20 -06:00
f4b80e6511
Translate Korean ( #6131 )
...
Relates to #6125 , #6099
2017-12-30 02:44:19 +01:00
511c6f9625
bug fix (WebPush does not work) ( #6120 )
2017-12-28 16:20:34 +01:00
832a93e67c
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
2017-12-28 08:30:51 -06:00
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
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
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
20ad071931
Set direction style to reply indicator (tootsuite pr #6006 )
2017-12-26 14:20:41 -06:00
14243bf80a
Reduce motion for boost animation (tootsuite pr #5871 )
2017-12-26 14:04:52 -06:00
337c2e77ee
Fix layout for RTL (tootsuite pr #6014 , #6018 )
2017-12-26 13:49:53 -06:00
46565ed746
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
2017-12-26 13:30:23 -06:00
815524412b
Move dropdown transform origin (tootsuite pr #6091 )
2017-12-26 13:28:19 -06:00
083571915f
onMuteNotifications validation (tootsuite pr #6092 )
2017-12-26 13:25:43 -06:00
2bbd22e91c
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
2017-12-26 13:21:20 -06:00
cc6a2ffd0a
use 'flavours/glitch/' prefix in new imports
2017-12-26 10:41:44 -06:00
22818d2a16
Add mute, block, conversation mute actions to detailed status dropdown menu
2017-12-26 10:13:38 -06:00
bed13f22e2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-25 20:17:10 +00:00
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
a3b369337f
Additional prop name change. ( #6098 )
2017-12-26 00:14:06 +09:00
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
7e6214b869
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
a8eb0bf44f
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
2017-12-24 04:48:31 +01:00
35fdf561be
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
081956742c
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
beatrix