aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fall back to instance settings consistentlyscarlett2018-10-21
|
* 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
| * \ \ Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-20
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | * upstream/develop: Update Hebrew translation fixed autocomplete Debug
| * | | More languagesHenry Jameson2018-09-09
| | | |
| * | | Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-09
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: fix lint Revert "Revert "Update messages.js"" i18n/messages.js: changed Folgende back to Follower updated german translation updated german translation cleaning up some translations that broke the building fix trailing comma Update and fix messages.js (pt, eo)
| * \ \ \ Merge remote-tracking branch 'upstream/develop' into translations-separationHenry Jameson2018-09-09
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (21 commits) use prime number step for Who to follow panel fix Revert "Update messages.js" Update messages.js Update the Occitan language - Fixed Linting remove formatting options Remove outdated settings features panel i18n features panes supports chat & gopher fix collapse link being too small small fix for non-square gif avatars Fixed collapseMessageWithSubjectLocal always using instance-provided config. Fix last place with usercard having wrong width Fixed non-masked image looking weird in chrome. Kinda went back to using align-items: stretch. Fixed error message floating. Simplified image sensitivity label show features panel only if not login update debug update debug ...
| * | | | | added usageHenry Jameson2018-09-06
| | | | | |
| * | | | | a tool to check what's missing from a languageHenry Jameson2018-09-06
| | | | | |
| * | | | | all other languages which do not have MRs related to them separatedHenry Jameson2018-09-06
| | | | | |
| * | | | | seems to be workingHenry Jameson2018-09-06
| | | | | |
| | | | * | small thing to display instance-provided defaultHenry Jameson2018-09-20
| | | | | |
| | | | * | console.log cleanupHenry Jameson2018-09-17
| | | | | |
| | | | * | Fixed "user.id is undefined" or something error more sane by properly handlingHenry Jameson2018-09-17
| | | | | | | | | | | | | | | | | | | | | | | | HTTP errors
| | | | * | undo rename because it makes less sense now.Henry Jameson2018-09-17
| | | | | |
| | | | * | proxying nodeinfoHenry Jameson2018-09-17
| | | | | |
| | | | * | made FE work even without either api or static configHenry Jameson2018-09-17
| | | | | |
| | | | * | Removed warning. Added support for working without static/config.jsonHenry Jameson2018-09-17
| | | | | |
| | | | * | more missing stuffHenry Jameson2018-09-17
| | | | | |
| | | | * | fix some missing stuffHenry Jameson2018-09-17
| | | | | |
| | | | * | translationsHenry Jameson2018-09-17
| | | | | |
| | | | * | Added more stuff that's actually being added to instanceConfig, simplified ↵Henry Jameson2018-09-17
| | | | | | | | | | | | | | | | | | | | | | | | the whitelist.
| | | | * | more refactoringHenry Jameson2018-09-17
| | | | | |