David Yip
df6311e002
Restore variable assignment in MuteService#call.
...
23dd2eb614
2017-10-12 04:27:45 -05:00
David Yip
7d0cf5a6a1
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
Eugen Rochko
d931706bcd
Change Android icon padding again to half of previous ( #5339 )
2017-10-12 00:58:14 +02:00
Sylvhem
ad4d5aaf96
Fixes and updates for the French translation ( #5340 )
...
* Ajout du support des thèmes multiples
Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.
Add translations for the new strings allowing support for multiple themes.
* Mise à jour de la traduction
Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.
Update modified strings and add new translations for the ones who are missing them.
* Remplace « ' » par « ’ »
Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.
Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.
2017-10-12 00:58:01 +02:00
Ondřej Hruška
d08756cfc3
Fix our media gallery not having alt text and tooltips
2017-10-11 22:02:24 +02:00
Ondřej Hruška
f8749b268c
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
Ondřej Hruška
0f542d56b8
add duck beaks in haml
2017-10-11 21:34:00 +02:00
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
1086b41599
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
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
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
takayamaki
4ee024e296
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
Nolan Lawson
3b6e5360c3
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
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
JohnD28
c66403114c
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
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
0b8b9e5a0d
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
takayamaki
cfab4a7ce4
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
af93f234ab
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
Jakob Kramer
d24ea1df74
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
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
nullkal
4a45cc7566
foreign_key, non-nullable, dependent: destroy in account_moderation_notes ( #5294 )
...
* Add foreign key constraint to column `account` in `account_moderation_notes`
* Change account_id and target_account_id to non-nullable in account_moderation_notes
* Add dependent: :destroy to account and target_account in account_moderation_notes
2017-10-10 13:12:17 +02:00
Eugen Rochko
0cbee44d94
Fix wrong dimensions on Android icon ( #5296 )
2017-10-10 12:41:30 +02:00
Eugen Rochko
658635d113
Material app icon for Chrome ( #5291 )
2017-10-09 21:27:16 +02:00
Eugen Rochko
5f20bd2e15
Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it ( #5290 )
2017-10-09 20:52:40 +02:00
Eugen Rochko
4a09a62f98
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
Eugen Rochko
522fa878c3
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
2017-10-09 20:51:24 +02:00
Jeong Arm
a5582bf9f5
Remove timestamps on any option ( #5282 )
2017-10-09 17:52:02 +02:00
Akihiko Odaki
783422f8f5
Fix pagination in Api::V1::BlocksController ( #5285 )
2017-10-09 17:30:31 +02:00
beatrix
6f578c25c6
try to tighten up local only toot stuff, like... properly ( #163 )
...
* try to tighten up local only toot stuff, like... properly
* try to un-break tests
2017-10-09 09:56:17 -04:00
unarist
12bdbf38ba
Fix migration failure due to StrongMigrations on production env ( #5283 )
2017-10-09 10:05:35 +02:00
Eugen Rochko
5a0e862664
Fix dependency of error page generation on database ( #5280 )
2017-10-09 10:05:10 +02:00
Eugen Rochko
2e9c614e77
Bump version to 2.0.0rc1 ( #5209 )
2017-10-08 22:03:44 +02:00
Eugen Rochko
a431000b97
Fix #5272 - Order of checks in ActivityPub handler ( #5276 )
2017-10-08 22:03:34 +02:00
Eugen Rochko
40328ea6a3
Fix #5271 - Fix missing attribute in remove_from_feed ( #5277 )
...
Regression from #4801
2017-10-08 21:55:34 +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
