aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix conflictshpuld2017-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
| | * Hide overflowing elements when userfinder is active. Don't scroll on button ↵shpuld2017-11-08
| | | | | | | | | | | | presses. Make buttons slightly bigger and more spaced out.
* | | Add a bunch of missed localization strings, update english and finnish to match.shpuld2017-11-08
|/ /
* | 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!
* | | Merge branch 'feature/fi-language' into 'develop'lambda2017-11-07
|\ \ \ | |/ / |/| | | | | | | | Add fi to localization. See merge request pleroma/pleroma-fe!127
| * | Add fi to localization.Shpuld Shpludson2017-11-07
|/ /
* | update readmeRoger Braun2017-11-07
| |
* | Add translation to readme.Roger Braun2017-11-07
| |
* | Set locale from browser settings.Roger Braun2017-11-07
| |
* | Prepare for i18n.Roger Braun2017-11-07
| |
* | Merge branch 'fix/friendica-html' into 'develop'lambda2017-11-07
|\ \ | |/ |/| | | | | | | | | Fix issue #33 Closes #33 See merge request pleroma/pleroma-fe!126
| * Changes inside status html: restrict image/video sizes, make blockquotes ↵Shpuld Shpuldson2017-11-07
| | | | | | | | waste less space.
* | Merge branch 'fix/authenticated-remote-profile-fetching' into 'develop'lambda2017-11-06
|\ \ | | | | | | | | | | | | Send credentials when fetching remote profile. See merge request pleroma/pleroma-fe!125
| * | Send credentials when fetching remote profile.eal2017-11-07
| |/
* | Merge branch 'fix/update-readme-new-repo' into 'develop'lambda2017-11-06
|\ \ | |/ |/| | | | | Update README.md See merge request pleroma/pleroma-fe!124
| * Update dual boot link in README.md for new repoShpuld Shpludson2017-11-02
|/
* Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'lambda2017-11-02
|\ | | | | | | | | Stop inappropriate auto fetching on scroll See merge request pleroma/pleroma-fe!123
| * Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵Shpuld Shpuldson2017-11-02
| |\ | | | | | | | | | fix/stop-inappropriate-scroll-auto-fetch
| * | Deregister scroll listener properly, only fetch more if timeline is visible.Shpuld Shpuldson2017-11-02
| | |
* | | Merge branch 'fix/disable-select-on-icons' into 'develop'lambda2017-11-02
|\ \ \ | |_|/ |/| | | | | | | | Disable text selection on icons and buttons See merge request pleroma/pleroma-fe!122
| * | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵Shpuld Shpuldson2017-11-02
| |\ \ | |/ / |/| | | | | fix/disable-select-on-icons
* | | Update .gitlab-ci.ymllambda2017-11-02
| |/ |/|
| * Also disable select on buttonsShpuld Shpuldson2017-11-02
| |
| * Add user-select: none to i elements.Shpuld Shpuldson2017-11-02
|/
* Merge branch 'feature/emoji-completion' into 'develop'lambadalambda2017-10-25
|\ | | | | | | | | Add emoji completion See merge request lambadalambda/pleroma-fe!122
| * Use the API endpoint for emoji completion.eal2017-10-19
| |
| * Actually actually fix image url.eal2017-09-19
| |
| * Actually fix image url.eal2017-09-19
| |