fe1c20cfb9
Fix tabs-vs-spaces issue pointed out by eslint.
2017-10-12 09:23:06 -05:00
edd1a00faf
Restore variable assignment in MuteService#call.
...
291feba6f1
2017-10-12 04:27:45 -05:00
13e05fece2
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
8e9911962d
Change Android icon padding again to half of previous ( #5339 )
2017-10-12 00:58:14 +02:00
3ebe03b729
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
eeaa8fba43
Fix our media gallery not having alt text and tooltips
2017-10-11 22:02:24 +02:00
b0b5ff1b0f
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
bd51a16150
add duck beaks in haml
2017-10-11 21:34:00 +02:00
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
6bc07d3de3
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
fbc6375fde
Add myself as codeowner of the translation files. ( #5333 )
2017-10-11 21:21:13 +02:00
0352c40e99
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
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
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
3cc6255a7e
Removed length check which now happens in reducer
2017-10-11 11:50:11 -07:00
35e2cad4eb
Fixed header emojification
2017-10-11 11:00:28 -07:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
27101f1beb
fix presented og:url is incorrect ( #5320 )
2017-10-11 19:22:21 +02:00
1823cf435a
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
6a50329a9c
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
b17e571bc2
Add padding to Android icon, change Apple and MS icons ( #5321 )
2017-10-11 19:11:15 +02:00
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
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
fe6941e28e
Update doorkeeper.fr.yml ( #5317 )
2017-10-11 22:04:36 +09:00
38600b2792
Update ar.json ( #5316 )
...
Pushing new arabic translated strings for Mastodon web client.
2017-10-11 21:19:04 +09:00
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
9b3d8ee346
Fix #5281 - Fix tooltip/custom emoji/search interaction ( #5310 )
2017-10-11 01:33:29 +02:00
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
552d22bec9
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
7c33da45f0
Bump version to 2.0.0rc2
2017-10-10 20:48:26 +02:00
9815be2a44
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
bebaa6eced
Remove prop types from external libraries ( #5304 )
2017-10-10 18:44:51 +02:00
616f53eea8
Update German translation ( #5302 )
2017-10-10 23:12:18 +09:00
61d3ecc805
Fix custom emoji copy not copying file ( #5298 )
2017-10-10 15:18:27 +02:00
4bb3e4eeba
Fix #5295 - Order custom emoji lexicographically ( #5297 )
2017-10-10 15:18:12 +02:00
784c7510d7
Fix an error when video playback buffer is empty ( #5300 )
2017-10-10 15:17:53 +02:00
6c54d2e583
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
96c942e8ab
Fix wrong dimensions on Android icon ( #5296 )
2017-10-10 12:41:30 +02:00
aafe55af81
Material app icon for Chrome ( #5291 )
2017-10-09 21:27:16 +02:00
fd49d5603a
Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it ( #5290 )
2017-10-09 20:52:40 +02:00
1c6fc0e4ce
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
92e7815d1d
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
2017-10-09 20:51:24 +02:00
9d97054fe6
Remove timestamps on any option ( #5282 )
2017-10-09 17:52:02 +02:00
cc796298c9
Fix pagination in Api::V1::BlocksController ( #5285 )
2017-10-09 17:30:31 +02:00
f0a2a6c875
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
7fd66cf2fe
Fix migration failure due to StrongMigrations on production env ( #5283 )
2017-10-09 10:05:35 +02:00
6e9e0c14e6
Fix dependency of error page generation on database ( #5280 )
2017-10-09 10:05:10 +02:00
0aa810f9c8
Bump version to 2.0.0rc1 ( #5209 )
2017-10-08 22:03:44 +02:00
3888a12c79
Fix #5272 - Order of checks in ActivityPub handler ( #5276 )
2017-10-08 22:03:34 +02:00
cfa68907ae
Fix #5271 - Fix missing attribute in remove_from_feed ( #5277 )
...
Regression from #4801
2017-10-08 21:55:34 +02:00
David Yip
Eugen Rochko
Sylvhem
Ondřej Hruška
Jeroen
Alda Marteau-Hardi
aschmitz
Lynx Kotoura
kibigo!
takayamaki
Nolan Lawson
JohnD28
ButterflyOfFire
unarist
Jakob Kramer
nullkal
Jeong Arm
Akihiko Odaki
beatrix