David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ...

Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss

2017-09-09 23:56:21 -05:00

..

locale-data

Add quotes ESLint rules (#3602)

2017-06-06 03:56:36 +02:00

ar.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

bg.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

ca.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

de.json

Make german translation more gender neutral #4755 (#4789)

2017-09-03 15:17:24 +02:00

defaultMessages.json

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

en.json

Add Pinned toot column (#4817)

2017-09-07 09:58:11 +02:00

eo.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

es.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

fa.json

i18n: update Persian translation (#4822)

2017-09-06 17:31:54 +02:00

fi.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

fr.json

i10n update OC and FR (#4849)

2017-09-08 13:55:47 +02:00

he.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

hr.json

Croatian translation - updated (#4183)

2017-09-03 18:10:53 +09:00

hu.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

id.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

index.js

Only load Intl data for current language (#3130)

2017-05-22 15:06:06 +02:00

io.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

it.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

ja.json

Add Pinned toot column (#4817)

2017-09-07 09:58:11 +02:00

ko.json

Add Pinned toot column (#4817)

2017-09-07 09:58:11 +02:00

nl.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

no.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

oc.json

i10n update OC and FR (#4849)

2017-09-08 13:55:47 +02:00

pl.json

i18n: Update Polish translation (#4845)

2017-09-08 05:51:48 +09:00

pt-BR.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

pt.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

ru.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

th.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

tr.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

uk.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

whitelist_ar.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_bg.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ca.json

Fix minor Japanese translations (#3099)

2017-05-17 17:50:39 +02:00

whitelist_de.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_en.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_eo.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_es.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_fa.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_fi.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_fr.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_he.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_hr.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_hu.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_id.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_io.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_it.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ja.json

Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)

2017-06-13 03:55:28 +02:00

whitelist_ko.json

i18n: Add korean translation (#4064)

2017-07-04 16:11:23 +02:00

whitelist_nl.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_no.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_oc.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_pl.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_pt-BR.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_pt.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ru.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_th.json

Add th.json. (#3588)

2017-06-05 17:02:41 +02:00

whitelist_tr.json

Fix duplicated values in nl.json (#2931)

2017-05-09 14:12:35 +02:00

whitelist_uk.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_zh-CN.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_zh-HK.json

Fix regular expression for RFC 5646 (regression from #3604) (#4133)

2017-07-10 14:02:18 +02:00

whitelist_zh-TW.json

Add zh-TW.json (#3459)

2017-05-30 23:09:02 +02:00

zh-CN.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

zh-HK.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00

zh-TW.json

Finish up embed modal feature (#4759)

2017-09-01 21:30:13 +02:00