aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into feature/scope_preferencesHenry Jameson2018-11-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (36 commits) remove deploy stage remove deploy stage updated and completed German translation minor modification of Chinese translation update Chinese translation Add Chinese language Fix posting. Count spoiler text in the character count. Fixes #135. Added Irish (Gaeilge) Language Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan. simplify code adapt to destructive change of api Adds Occitan locale Updated italian translation Update oc.json Update oc.json Update of the oc.json file Actualizacion del fichièr oc.json Sort messages object by language code so that it's easier from the UI to browse them. explicitly set collapseMessageWithSubject to undefined Fall back to instance settings consistently ...
| * remove deploy stageRoger Braun2018-11-13
| |
| * remove deploy stageRoger Braun2018-11-13
| |
| * Merge branch 'patch-1' into 'develop'lambda2018-11-13
| |\ | | | | | | | | | | | | [i18] Correction Occitan file See merge request pleroma/pleroma-fe!369
| | * Copy-Paste too fast from the Catalan file apparently.Exilat2018-10-28
| | | | | | | | | Now it's in good Occitan.
| * | Merge branch 'i18n/irish' into 'develop'lambda2018-11-13
| |\ \ | | | | | | | | | | | | | | | | Added Irish (Gaeilge) Language See merge request pleroma/pleroma-fe!370
| | * | Added Irish (Gaeilge) Languagedgold2018-11-02
| | |/ | | | | | | | | | | | | All translations checked with tearma.ie & acmhainn.ie for language use and technical accuracy.
| * | Merge branch 'develop' into 'develop'lambda2018-11-13
| |\ \ | | | | | | | | | | | | | | | | updated and completed German translation See merge request pleroma/pleroma-fe!373
| | * | updated and completed German translationVinzenz Vietzke2018-11-12
| |/ /
| * | Merge branch 'develop' into 'develop'lambda2018-11-10
| |\ \ | | | | | | | | | | | | | | | | Added Chinese Language See merge request pleroma/pleroma-fe!372
| | * | minor modification of Chinese translationStarmancer2018-11-09
| | | |
| | * | update Chinese translationStarmancer2018-11-09
| | | |
| | * | Add Chinese languageNebula2018-11-09
| |/ /
| * | Fix posting.Roger Braun2018-11-08
| | |
| * | Merge branch '153-count-cw' into 'develop'lambda2018-11-07
| |\ \ | | |/ | |/| | | | | | | | | | | | | Resolve "PleromaFE does not count the Content Warning into Post length" Closes #153 and #135 See merge request pleroma/pleroma-fe!371
| | * Count spoiler text in the character count. Fixes #135.Roger Braun2018-11-07
| |/
| * Merge branch 'fix-features-panel' into 'develop'Henry2018-10-26
| |\ | | | | | | | | | | | | Fix Features panel See merge request pleroma/pleroma-fe!366
| | * simplify codehakabahitoyo2018-10-26
| | |
| | * adapt to destructive change of apiHakaba Hitoyo2018-10-26
| |/
| * Merge branch 'develop' into 'develop'Henry2018-10-25
| |\ | | | | | | | | | | | | [i18n] Adds Occitan locale [ago-file] See merge request pleroma/pleroma-fe!365
| | * Adds Occitan localeExilat2018-10-25
| | |
| * | Merge branch 'patch-1' into 'develop'Henry2018-10-25
| |\ \ | | | | | | | | | | | | | | | | Updated italian translation See merge request pleroma/pleroma-fe!364
| | * | Updated italian translationsilkevicious2018-10-25
| | |/
| * | Merge branch 'undefined' into 'develop'Henry2018-10-25
| |\ \ | | |/ | |/| | | | | | | [i18n] Translation: update of the oc.json file See merge request pleroma/pleroma-fe!363
| | * Update oc.jsonExilat2018-10-25
| | |
| | * Update oc.jsonExilat2018-10-24
| | |
| | * Update of the oc.json fileExilat2018-10-23
| |/ | | | | Actualizacion del fichièr oc.json
| * Merge branch 'instance-setting-fallback' into 'develop'Henry2018-10-21
| |\ | | | | | | | | | | | | Fall back to instance settings consistently See merge request pleroma/pleroma-fe!361
| | * explicitly set collapseMessageWithSubject to undefinedscarlett2018-10-21
| | |
| | * Fall back to instance settings consistentlyscarlett2018-10-21
| | |
| * | Merge branch 'sorted-messages' into 'develop'Henry2018-10-21
| |\ \ | | |/ | |/| | | | | | | Sort messages object See merge request pleroma/pleroma-fe!362
| | * Sort messages object by language code so that it's easier from the UI to ↵fadelkon2018-10-21
| |/ | | | | | | browse them.
| * Merge branch 'i18n/arabic' into 'develop'Henry2018-10-21
| |\ | | | | | | | | | | | | Add arabic translation See merge request pleroma/pleroma-fe!360
| | * Adding arabic to messages.jsButterflyOfFire2018-10-21
| | |
| | * Adding arabic translation.ButterflyOfFire2018-10-21
| | |
| * | Merge branch 'catalan' into 'develop'Henry2018-10-17
| |\ \ | | | | | | | | | | | | | | | | Create catalan translation See merge request pleroma/pleroma-fe!355
| | * | Translate not only timeago prefix, but time units. Make consistent the ↵fadelkon2018-10-16
| | | | | | | | | | | | | | | | translation for "bio" and add ellipsis to the default status text.
| | * | Add catalan require to messages.jsfadelkon2018-10-14
| | | |
| | * | Finish general and timeago catalan strings. Glossary:fadelkon2018-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bio: presentació * timeline: flux [d'entrades] * post/status: entrada * settings: configuració * user: usuari/a * users: usuàries * background: fons de pantalla * banner: fons de perfil * follower: seguidor/a * follow: contacte/a qui segueixo * avatar: avatar * [visibility] scope: abast de la publicació Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ .
| | * | Translate some strings to catalan. Most part of block "settings" is not ↵fadelkon2018-10-02
| | | | | | | | | | | | | | | | translated yet
| | * | Add placeholder catalan translation file to be able to see the work in ↵fadelkon2018-10-02
| | | | | | | | | | | | | | | | progress in further commits
| * | | Merge branch 'hide-statistics' into 'develop'kaniini2018-10-16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add options for hiding post and user engagement statistics. See merge request pleroma/pleroma-fe!336
| | * | | satisfy lintscarlett2018-10-16
| | | | |
| | * | | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵scarlett2018-10-16
| | |\ \ \ | | |/ / / | |/| | | | | | | | hide-statistics
| * | | | Merge branch 'update-nb' into 'develop'Henry2018-10-14
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Update norwegian translation See merge request pleroma/pleroma-fe!356
| | * | | Update norwegian translationmorguldir2018-10-14
| |/ / /
| * | | Merge branch 'i18n/no_rich_text' into 'develop'kaniini2018-09-27
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Less confusing description for no_rich_text_formatting See merge request pleroma/pleroma-fe!351
| | * | Less confusing descriptionHenry Jameson2018-09-25
| | | |
| | | * Revert "Don't only include whitespace conditionally, to fix the fade."scarlett2018-09-04
| | | | | | | | | | | | | | | | This reverts commit 8dc85b057e058a39f968fa188e0d77a5a9dd5ca6.
| | | * Don't only include whitespace conditionally, to fix the fade.scarlett2018-09-04
| | | |
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-08 23:34:54 +0000