Ondřej Hruška
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
Jeroen
e3717ffadc
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
Alda Marteau-Hardi
ae4345e6d4
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
Lynx Kotoura
75e036b493
Fix styles of error pages ( #5335 )
...
Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link>
2017-10-11 21:18:45 +02:00
kibigo!
037d7478af
Removed length check which now happens in reducer
2017-10-11 11:50:11 -07:00
kibigo!
215da1a03c
Fixed header emojification
2017-10-11 11:00:28 -07:00
kibigo!
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
Eugen Rochko
794e015ea2
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
Eugen Rochko
6e729f42c3
Fully disable hotkeys when input element is focused ( #5324 )
...
Because alt+n is a way to enter some kinda letter on some keyboard
2017-10-11 16:31:07 +02:00
JohnD28
eacf9b9039
Update french translation : mastodon/locales/fr.json ( #5318 )
...
* Update fr.json
* Update fr.json
* Update fr.json
2017-10-11 22:07:09 +09:00
ButterflyOfFire
ffe158fc96
Update ar.json ( #5316 )
...
Pushing new arabic translated strings for Mastodon web client.
2017-10-11 21:19:04 +09:00
unarist
2b29f5b5f1
Fix an error when ancestors get loaded before the status itself ( #5312 )
...
When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.
Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly.
2017-10-11 11:25:15 +02:00
Eugen Rochko
6fc71ff7f2
Fix #5306 : Stop hotkeys in input fields even when shift is pressed ( #5309 )
...
AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea
2017-10-11 01:01:17 +02:00
Eugen Rochko
af93f234ab
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
Eugen Rochko
4c6adaf4f4
Fix #5295 - Order custom emoji lexicographically ( #5297 )
2017-10-10 15:18:12 +02:00
unarist
9c448a0280
Fix an error when video playback buffer is empty ( #5300 )
2017-10-10 15:17:53 +02:00
Eugen Rochko
4a09a62f98
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
Eugen Rochko
f8ec132261
Track frequently used emojis in web UI ( #5275 )
...
* Track frequently used emojis in web UI
* Persist emoji usage, but debounce commits to the settings API
* Fix #5144 - Add tooltips to picker
* Display only 2 lines of frequently used emojis
2017-10-08 21:47:15 +02:00
Ondřej Hruška
2f8dc023a5
improve static page metadata look
2017-10-08 10:46:59 +02:00
JeanGauthier
5bff1ad44e
i18n update Occitan ( #5263 )
...
* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json
2017-10-08 14:18:27 +09:00
Nolan Lawson
7a66400670
Video preload should be a string ( #5267 )
2017-10-08 03:06:43 +02:00
Nolan Lawson
7bde8dcc08
Use ES module build of react-router-dom ( #5264 )
2017-10-08 02:55:58 +02:00
Eugen Rochko
8279ea2f54
Dynamically calculate card height for embeds instead of padding ( #5265 )
...
The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height
2017-10-08 02:34:49 +02:00
Eugen Rochko
1e7e6413fc
Show buffering in video player ( #5261 )
2017-10-08 02:33:08 +02:00
Eugen Rochko
b98cd0041b
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
Eugen Rochko
519c4c446a
Fix custom emoji in emoji picker, persist skin tone ( #5258 )
2017-10-07 19:02:30 +02:00
MitarashiDango
b5aeaa395a
Japanese translation (relative time) ( #5251 )
2017-10-08 01:32:03 +09:00
Nolan Lawson
14db4829dc
Update emoji-mart to v2.1.1 ( #5256 )
2017-10-07 12:17:02 +02:00
Eugen Rochko
b68aa42383
Fix regression from #5206 - deduplicate descendants ( #5253 )
2017-10-07 12:16:39 +02:00
kibigo!
fb05013855
Basic static metadata styling
2017-10-06 22:22:34 -07:00
Eugen Rochko
11ceec2756
Make auto-play GIFs preference affect custom emojis in web UI ( #5254 )
2017-10-07 02:38:52 +02:00
Lynx Kotoura
d33bc0c04f
Fix overflowing in web UI ( #5246 )
...
* Fix overflowing in web UI
* Revert fixing dropdown menu modal
2017-10-06 20:40:17 +02:00
K.SHIRAKASHI
31501f47c5
Fix error on reloading status detail column ( #5248 )
2017-10-06 20:37:56 +02:00
MIYAGI Hikaru
a22adce069
Fix error at emoji_compressed in Firefox ESR ( #5241 )
2017-10-06 16:40:41 +02:00
Nolan Lawson
651aba0e12
Fix thinking_face emoji autocomplete ( #5238 )
2017-10-06 12:03:13 +02:00
Ondřej Hruška
4bc0a9d1e9
comment out unused stuff with Video
2017-10-06 09:23:28 +02:00
Nolan Lawson
749a6d2511
Import only Spring/Motion from react-motion ( #5236 )
2017-10-06 03:46:15 +02:00
Nolan Lawson
2b34471d9d
Compress and combine emoji data ( #5229 )
2017-10-06 03:42:34 +02:00
Nolan Lawson
ac55d742c2
import only Overlay from react-overlays ( #5235 )
2017-10-06 03:24:33 +02:00
Eugen Rochko
32998720eb
Implement hotkeys for web UI ( #5164 )
...
* Fix #2102 - Implement hotkeys
Hotkeys on status list:
- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back
* Add navigational hotkeys
The key g followed by:
- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users
* Add hotkey for focusing search, make escape un-focus compose/search
* Fix focusing notifications column, fix hotkeys in compose textarea
2017-10-06 01:07:59 +02:00
Eugen Rochko
f37350c08f
When processing custom emoji, ensure a non-animated version exists ( #5230 )
...
Use the non-animated version in web UI, but return both in API
2017-10-05 23:41:47 +02:00
Ondřej Hruška
37f69bb4db
workaround for notif clearing
2017-10-05 21:55:02 +02:00
Lynx Kotoura
4e822d41b9
adjust public profile pages 2 ( #5223 )
2017-10-04 22:49:36 +02:00
MitarashiDango
dd3f9ec261
fix error (When part of conversation has already been deleted.) ( #5216 )
2017-10-04 16:28:39 +02:00
Eugen Rochko
2a9819b8ec
Use own, shorter relative timestamps ( #5171 )
...
* Use own, shorter relative timestamps
* Add acct to title tooltip of display name in statuses
* Improve i18n of the relative times
2017-10-04 01:23:52 +02:00
Eugen Rochko
e702a64f41
When a streaming API status arrives, sort it into conversations ( #5206 )
2017-10-04 01:01:44 +02:00
m4sk1n
5b9ea85b62
i18n: Update Polish translation ( #5202 )
2017-10-03 21:15:41 +02:00
Nolan Lawson
e766862f65
Compress emoji_data_light.js ( #5201 )
2017-10-03 20:43:57 +02:00
PFM
3d8d23515f
Add pagination in media modal ( #4343 )
...
* Add pagination in media modal
* Change array name
* Add an element class
* Avoid nested class
* Pull out the active class
* Use map instead of forEach
* Remove parentheses
2017-10-03 17:11:22 +02:00
Yamagishi Kazutoshi
8d3ff887ab
Add placeholder text color to form of media attachments ( #5196 )
2017-10-03 13:10:57 +02:00