aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix typo.Roger Braun2018-11-06
|
* Merge remote-tracking branch 'origin/develop' into oauthRoger Braun2018-10-26
|\
| * 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
| | |
* | | Remove gonsole.logg :DDRoger Braun2018-10-26
| | |
* | | Fix linting.Roger Braun2018-10-26
| | |
* | | Move login to oauth.Roger Braun2018-10-26
|/ /
* | 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
| | |
* | | Merge branch 'fix/i18n/instance_default' into 'develop'Henry2018-09-25
|\ \ \ | |/ / |/| | | | | | | | Fix instance_default in en and fr See merge request pleroma/pleroma-fe!352
| * | i think it's due to my shitty js-to-json regexHenry Jameson2018-09-25
|/ /
* | Merge branch 'fixup_french_translation' into 'develop'Henry2018-09-24
|\ \ | | | | | | | | | | | | Fixup french translation See merge request pleroma/pleroma-fe!350
| * | src/i18n/fr.json: More accurate translationHaelwenn (lanodan) Monnier2018-09-24
|/ /
* | Merge branch 'update-japanese-translation' into 'develop'Henry2018-09-24
|\ \ | | | | | | | | | | | | Update Japanese translation See merge request pleroma/pleroma-fe!349
| * | update Japanese translationhakabahitoyo2018-09-23
|/ /
* | Merge branch 'update/french-translation' into 'develop'kaniini2018-09-22
|\ \ | | | | | | | | | | | | update french translation See merge request pleroma/pleroma-fe!348
| * | update french translationWilliam Pitcock2018-09-22
|/ /
* | Merge branch 'feature/rich-text-optout' into 'develop'kaniini2018-09-22
|\ \ | | | | | | | | | | | | add support for disabling rich text formatting See merge request pleroma/pleroma-fe!347
| * | add support for disabling rich text formattingWilliam Pitcock2018-09-22
|/ /
* | Merge branch 'betterStorage' into 'develop'Henry2018-09-21
|\ \ | | | | | | | | | | | | Better storage See merge request pleroma/pleroma-fe!343
| * \ Merge remote-tracking branch 'upstream/develop' into betterStorageHenry Jameson2018-09-21
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | * upstream/develop: More languages added usage a tool to check what's missing from a language all other languages which do not have MRs related to them separated seems to be working
* | | Merge branch 'translations-separation' into 'develop'Henry2018-09-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Separation of translation file into several smaller ones. Closes #142 See merge request pleroma/pleroma-fe!337