 Hakaba Hitoyo
|
01aba3f9c6
adapt to destructive change of api
|
6 years ago |
|
Henry
|
20e4ec4979
Merge branch 'develop' into 'develop'
|
6 years ago |
|
Exilat
|
0a261d2a7d
Adds Occitan locale
|
6 years ago |
|
Henry
|
7f0e140a4f
Merge branch 'patch-1' into 'develop'
|
6 years ago |
|
Henry
|
0f30d95f3a
Merge branch 'undefined' into 'develop'
|
6 years ago |
|
silkevicious
|
c61e658c1d
Updated italian translation
|
6 years ago |
|
Exilat
|
d1614c432f
Update oc.json
|
6 years ago |
|
Exilat
|
68d90684c4
Update oc.json
|
6 years ago |
|
Exilat
|
8c585b0291
Update of the oc.json file
|
6 years ago |
|
Henry
|
48d6483700
Merge branch 'instance-setting-fallback' into 'develop'
|
6 years ago |
|
Henry
|
5f65520287
Merge branch 'sorted-messages' into 'develop'
|
6 years ago |
|
fadelkon
|
ec7b7ab49c
Sort messages object by language code so that it's easier from the UI to browse them.
|
6 years ago |
|
scarlett
|
c02a9089e1
explicitly set collapseMessageWithSubject to undefined
|
6 years ago |
|
scarlett
|
d6ad08050a
Fall back to instance settings consistently
|
6 years ago |
|
Henry
|
82cc37a55e
Merge branch 'i18n/arabic' into 'develop'
|
6 years ago |
|
ButterflyOfFire
|
131526373f
Adding arabic to messages.js
|
6 years ago |
|
ButterflyOfFire
|
373d6ca990
Adding arabic translation.
|
6 years ago |
|
Henry
|
d81887e34f
Merge branch 'catalan' into 'develop'
|
6 years ago |
|
fadelkon
|
bf3e3f8b9a
Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text.
|
6 years ago |
|
kaniini
|
e64af481d2
Merge branch 'hide-statistics' into 'develop'
|
6 years ago |
|
scarlett
|
2bb663f0f6
satisfy lint
|
6 years ago |
|
scarlett
|
4cc1ed6171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics
|
6 years ago |
|
fadelkon
|
0c2f4b925e
Add catalan require to messages.js
|
6 years ago |
|
Henry
|
f554edc054
Merge branch 'update-nb' into 'develop'
|
6 years ago |
|
morguldir
|
7c4790d1bc
Update norwegian translation
|
6 years ago |
|
fadelkon
|
59dec1b43f
Finish general and timeago catalan strings. Glossary:
|
6 years ago |
|
fadelkon
|
f8323b72ae
Translate some strings to catalan. Most part of block "settings" is not translated yet
|
6 years ago |
|
fadelkon
|
0beba08618
Add placeholder catalan translation file to be able to see the work in progress in further commits
|
6 years ago |
|
kaniini
|
65c03f1a0b
Merge branch 'i18n/no_rich_text' into 'develop'
|
6 years ago |
|
Henry Jameson
|
b66d7901f1
forgot to actually handle the instance config. this part needs a rewrite...
|
6 years ago |
|
Henry Jameson
|
d5e82625d3
lint fix
|
6 years ago |
|
Henry Jameson
|
ef968d8e1e
now it actually works
|
6 years ago |
|
Henry Jameson
|
6165b7366a
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
|
6 years ago |
|
Henry Jameson
|
455cd0d028
settings for scope/subject
|
6 years ago |
|
Henry
|
9d0bbe37e6
Merge branch 'fix/i18n/instance_default' into 'develop'
|
6 years ago |
|
Henry Jameson
|
85235981d1
i think it's due to my shitty js-to-json regex
|
6 years ago |
|
Henry Jameson
|
11f1bac502
Less confusing description
|
6 years ago |
|
Henry
|
bfd2b45672
Merge branch 'fixup_french_translation' into 'develop'
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
8cb62fae70
src/i18n/fr.json: More accurate translation
|
6 years ago |
|
Henry
|
40210ae31b
Merge branch 'update-japanese-translation' into 'develop'
|
6 years ago |
|
hakabahitoyo
|
86528d84e2
update Japanese translation
|
6 years ago |
|
kaniini
|
01127c2db0
Merge branch 'update/french-translation' into 'develop'
|
6 years ago |
|
William Pitcock
|
2f674eb13d
update french translation
|
6 years ago |
|
kaniini
|
1cbabf31ee
Merge branch 'feature/rich-text-optout' into 'develop'
|
6 years ago |
|
William Pitcock
|
1af5c8fd39
add support for disabling rich text formatting
|
6 years ago |
|
Henry
|
cd48268c85
Merge branch 'betterStorage' into 'develop'
|
6 years ago |
|
Henry Jameson
|
1c2f0029e4
Merge remote-tracking branch 'upstream/develop' into betterStorage
|
6 years ago |
|
Henry
|
6f32ccf417
Merge branch 'translations-separation' into 'develop'
|
6 years ago |
|
Henry Jameson
|
a61ad0544a
small thing to display instance-provided default
|
6 years ago |
|
Henry Jameson
|
537b1ff2d8
Merge remote-tracking branch 'upstream/develop' into translations-separation
|
6 years ago |
