Commit Graph

1470 Commits (0ca42bd3d63e209f9c1354a30a3123c1f7317579)
 

Author SHA1 Message Date
Henry Jameson 0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
6 years ago
Roger Braun e9b68b8c97 remove deploy stage
6 years ago
Roger Braun ee29bca60a remove deploy stage
6 years ago
lambda be8a4a9745 Merge branch 'patch-1' into 'develop'
6 years ago
lambda 2a61f2b24c Merge branch 'i18n/irish' into 'develop'
6 years ago
lambda c1f518882e Merge branch 'develop' into 'develop'
6 years ago
Vinzenz Vietzke ae927f8628 updated and completed German translation
6 years ago
lambda 70e01c6ec3 Merge branch 'develop' into 'develop'
6 years ago
Starmancer 4c5073a66c minor modification of Chinese translation
6 years ago
Starmancer 819e9ce6a3 update Chinese translation
6 years ago
Nebula e1d21512a9 Add Chinese language
6 years ago
Roger Braun 2c2c4452b9 Fix posting.
6 years ago
lambda a1962a610a Merge branch '153-count-cw' into 'develop'
6 years ago
Roger Braun 6f668df697 Count spoiler text in the character count. Fixes #135.
6 years ago
dgold 4f258b4940
Added Irish (Gaeilge) Language
6 years ago
Exilat 6dd675566e Copy-Paste too fast from the Catalan file apparently.
6 years ago
Henry 2f11ec296e Merge branch 'fix-features-panel' into 'develop'
6 years ago
hakabahitoyo 630c6e3e44 simplify code
6 years ago
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