Ondřej Hruška
0bf9261e65
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
Jeroen
6bc07d3de3
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
Alda Marteau-Hardi
1086b41599
Add myself as codeowner of the translation files. ( #5333 )
2017-10-11 21:21:13 +02:00
Alda Marteau-Hardi
fbc6375fde
Add myself as codeowner of the translation files. ( #5333 )
2017-10-11 21:21:13 +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
Alda Marteau-Hardi
0352c40e99
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
aschmitz
93e3eaf95d
Fix #5329 ( #5332 )
...
This fixes #5329 , which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.
2017-10-11 21:20:39 +02:00
aschmitz
e5d8166a12
Fix #5329 ( #5332 )
...
This fixes #5329 , which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.
2017-10-11 21:20:39 +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
Lynx Kotoura
07ea625cb2
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!
3cc6255a7e
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!
35e2cad4eb
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
kibigo!
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
takayamaki
4ee024e296
fix presented og:url is incorrect ( #5320 )
2017-10-11 19:22:21 +02:00
takayamaki
27101f1beb
fix presented og:url is incorrect ( #5320 )
2017-10-11 19:22:21 +02: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
1823cf435a
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
Nolan Lawson
3b6e5360c3
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
Nolan Lawson
6a50329a9c
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
Eugen Rochko
cb78a30a77
Add padding to Android icon, change Apple and MS icons ( #5321 )
2017-10-11 19:11:15 +02:00
Eugen Rochko
b17e571bc2
Add padding to Android icon, change Apple and MS icons ( #5321 )
2017-10-11 19:11:15 +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
Eugen Rochko
476e79b8e3
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
JohnD28
19d3317a69
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
JohnD28
c66403114c
Update doorkeeper.fr.yml ( #5317 )
2017-10-11 22:04:36 +09:00
JohnD28
fe6941e28e
Update doorkeeper.fr.yml ( #5317 )
2017-10-11 22:04:36 +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
ButterflyOfFire
38600b2792
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
unarist
b0407ece42
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
0b8b9e5a0d
Fix #5281 - Fix tooltip/custom emoji/search interaction ( #5310 )
2017-10-11 01:33:29 +02:00
Eugen Rochko
9b3d8ee346
Fix #5281 - Fix tooltip/custom emoji/search interaction ( #5310 )
2017-10-11 01:33:29 +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
b3d7ad958f
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
takayamaki
cfab4a7ce4
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
takayamaki
552d22bec9
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
Eugen Rochko
03457653e9
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
Eugen Rochko
7c33da45f0
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +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
9815be2a44
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
Nolan Lawson
82ff80dbad
Remove prop types from external libraries ( #5304 )
2017-10-10 18:44:51 +02:00
Nolan Lawson
bebaa6eced
Remove prop types from external libraries ( #5304 )
2017-10-10 18:44:51 +02:00
Jakob Kramer
d24ea1df74
Update German translation ( #5302 )
2017-10-10 23:12:18 +09:00
Jakob Kramer
616f53eea8
Update German translation ( #5302 )
2017-10-10 23:12:18 +09:00
Eugen Rochko
9d5075740a
Fix custom emoji copy not copying file ( #5298 )
2017-10-10 15:18:27 +02:00
