aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'feature/blocks' into 'develop'lambda2017-11-08
|\ | | | | | | | | Add blocks. See merge request pleroma/pleroma-fe!130
| * Add blocks.eal2017-11-07
|/
* 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
| |
| * Fix image url.eal2017-09-19
| |
| * Add emoji completion.eal2017-09-19
|/
* Merge branch 'feature/tag-timelines' into 'develop'lambadalambda2017-09-17
|\ | | | | | | | | Add tag timeline view. See merge request !121
| * Remove another cache file.eal2017-09-17
| |
| * Remove cache file.eal2017-09-17
| |
| * Add tag timeline view.eal2017-09-17
|/
* Merge branch 'fix/set-cookie' into 'develop'lambadalambda2017-09-13
|\ | | | | | | | | Set cookies on fetch See merge request !114
| * Revert "Include cookie in every request"eal2017-09-02
| | | | | | | | | | | | This reverts commit 00589a9af153bad4d8e7f14669c1497443f5221b. Changing same-origin to the unsafer include did not fix the bug it was supposed to.
| * Include cookie in every requesteal2017-09-02
| |
| * Make sure options exists every time on fetch()eal2017-09-02
| |
| * Set cookies on fetcheal2017-08-31
| |
* | Merge branch 'feature/login-with-cookie' into 'develop'lambadalambda2017-09-13
|\ \ | | | | | | | | | | | | Try logging in with the existing cookie. See merge request !116
| * | Try logging in with the existing cookie.Roger Braun2017-09-02
| |/
* | Merge branch 'fix/upload-buttons-clickable' into 'develop'lambadalambda2017-09-13
|\ \ | | | | | | | | | | | | Fix hide and cancel buttons on chromium See merge request !119