aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix/pleromabe-is-other-user' into 'develop'Shpuld Shpludson2017-11-09
|\ | | | | | | | | Fix isOtherUser on pleroma-be See merge request pleroma/pleroma-fe!137
| * Fix isOtherUser on pleroma-beeal2017-11-08
| |
* | Merge branch 'feature/timeago-locales' into 'develop'lambda2017-11-09
|\ \ | | | | | | | | | | | | Revert to English timeago for latin script languages. See merge request pleroma/pleroma-fe!144
| * | Revert to English timeago for latin script languages.eal2017-11-09
| | |
* | | Merge branch 'fix/dont-show-rts-more-than-once' into 'develop'lambda2017-11-09
|\ \ \ | | | | | | | | | | | | | | | | Don't show repeats that have been shown already. See merge request pleroma/pleroma-fe!143
| * | | Don't show repeats that have been shown already.shpuld2017-11-09
|/ / /
* | | Merge branch 'ro-translation' into 'develop'lambda2017-11-09
|\ \ \ | | | | | | | | | | | | | | | | Romanian translation See merge request pleroma/pleroma-fe!142
| * | | Corrected the const en to const ro for romanianTibike2017-11-09
| | | |
| * | | Added romanian translationsTibike2017-11-09
| | | |
| * | | Added missing hungarinan translationsTibike2017-11-09
| | | |
* | | | Add spanish translation.Roger Braun2017-11-09
|/ / / | | | | | | | | | Thanks, Aemon!
* | | Merge branch 'fix/i18n-mentions-timeline-title' into 'develop'lambda2017-11-08
|\ \ \ | | | | | | | | | | | | | | | | Make mentions-timeline use i18n. See merge request pleroma/pleroma-fe!141
| * | | Make mentions-timeline use i18n.Shpuld Shpludson2017-11-08
| | | |
* | | | Merge branch 'feature/timeago-locales' into 'develop'lambda2017-11-08
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Add timeago locales. See merge request pleroma/pleroma-fe!140
| * / Add timeago locales.eal2017-11-08
| |/
* | Merge branch 'develop' into 'develop'lambda2017-11-08
|\ \ | | | | | | | | | | | | Update Estonian translation See merge request pleroma/pleroma-fe!138
| * | Update Estonian translationobrez2017-11-08
| |/
* | Merge branch 'fix/attachment-fixes' into 'develop'lambda2017-11-08
|\ \ | |/ |/| | | | | | | | | Fix #38 and video CSS Closes #38 See merge request pleroma/pleroma-fe!136
| * Fix oembeds from overflowing on Firefox, fix video border color as well as ↵shpuld2017-11-08
| | | | | | | | vertical size.
* | Merge branch 'develop' into 'develop'lambda2017-11-08
|\ \ | |/ |/| | | | | add japanese translation See merge request pleroma/pleroma-fe!135
| * add japanese translationnaf2017-11-08
|/
* Update polandish.Roger Braun2017-11-08
|
* Merge branch 'fix/missing-localization-strings' into 'develop'lambda2017-11-08
|\ | | | | | | | | | | | | Fix #37: Missing localization strings Closes #37 See merge request pleroma/pleroma-fe!133
| * Fix conflictshpuld2017-11-08
| |\
| * | Add a bunch of missed localization strings, update english and finnish to match.shpuld2017-11-08
| | |
* | | Merge branch 'develop' into 'develop'lambda2017-11-08
|\ \ \ | |_|/ |/| | | | | | | | Add Estonian translation See merge request pleroma/pleroma-fe!134
| * | Add Estonian translationobrez2017-11-08
| |/
* | Merge branch 'fix/polish-user-finder-and-nav-buttons' into 'develop'lambda2017-11-08
|\ \ | |/ |/| | | | | Fix/polish user finder and nav buttons See merge request pleroma/pleroma-fe!132
| * Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵shpuld2017-11-08
| |\ | |/ |/| | | fix/polish-user-finder-and-nav-buttons
* | Add Polish translation.Roger Braun2017-11-08
| | | | | | | | Thanks, Roka!
* | Unify statuses/notices.Roger Braun2017-11-08
| |
* | Merge branch 'tibike/pleroma-fe-hu-translation' into developRoger Braun2017-11-08
|\ \
| * \ Merge branch 'develop' into tibike/pleroma-fe-hu-translationRoger Braun2017-11-08
| |\ \ | |/ / |/| |
* | | Fix typo.Roger Braun2017-11-08
| | |
* | | Add italian translation.Roger Braun2017-11-08
| | | | | | | | | | | | Thank, Eidon!
* | | Add french translation.Roger Braun2017-11-08
| | | | | | | | | | | | Thanks, azu!
* | | Merge branch 'feature/blocks' into 'develop'lambda2017-11-08
|\ \ \ | | | | | | | | | | | | | | | | Add blocks. See merge request pleroma/pleroma-fe!130
| * | | Add blocks.eal2017-11-07
|/ / /
| * | Fix typo.Roger Braun2017-11-08
| | |
| * | Added Hungarian translationTibike2017-11-08
|/ /
* | Merge branch 'feature/ger-translation' into 'develop'lambda2017-11-07
|\ \ | | | | | | | | | | | | Add DE translation See merge request pleroma/pleroma-fe!128
| * | make linter happySebastian Huebner2017-11-07
| | |
| * | Merge branch 'feature/ger-translation' of ↵Sebastian Huebner2017-11-07
| |\ \ | | | | | | | | | | | | git.pleroma.social:pleroma/pleroma-fe into feature/ger-translation
| | * \ rebaseSebastian Huebner2017-11-07
| | |\ \
| | | * | added ger translationSebastian Huebner2017-11-07
| | | | |
| | * | | added ger translationSebastian Huebner2017-11-07
| | | | |
| * | | | added ger translationSebastian Huebner2017-11-07
| | | | |
* | | | | Update ja translation.Roger Braun2017-11-07
|/ / / /
* / / / Japanese is ja.Roger Braun2017-11-07
|/ / /
* | | Add japanese translation.Roger Braun2017-11-07
| | | | | | | | | | | | Thanks, https://knzk.me/@imncls!