aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* review changesShpuld Shpuldson2020-01-28
|
* Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe ↵Shpuld Shpuldson2020-01-27
|\ | | | | | | into feat/emoji-reactions
| * Apply suggestion to src/services/api/api.service.jslain2020-01-27
| |
* | remove unnecessary anonymous functionShpuld Shpuldson2020-01-27
|/
* remove logs/commented codeShpuld Shpuldson2020-01-27
|
* remove favs count from react buttonShpuld Shpuldson2020-01-26
|
* Merge branch 'develop' into feat/emoji-reactionsShpuld Shpuldson2020-01-26
|\
| * Merge branch 'event-target-fix' into 'develop'HJ2020-01-24
| |\ | | | | | | | | | | | | | | | | | | Polyfills for EventTarget and CustomEvent Closes #756 See merge request pleroma/pleroma-fe!1048
| | * Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed ↵eugenijm2020-01-24
| |/ | | | | | | for IE)
| * Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'HJ2020-01-23
| |\ | | | | | | | | | | | | | | | | | | Fix missing TWKN when logged in, but server is set to private mode. Closes #759 See merge request pleroma/pleroma-fe!1047
| | * Fix missing TWKN when logged in, but server is set to private mode.Mark Felder2020-01-23
| |/
| * Merge branch 'fix-follow-requests' into 'develop'Shpuld Shpludson2020-01-21
| |\ | | | | | | | | | | | | | | | | | | Fix follower request fetching Closes pleroma#1523 and #757 See merge request pleroma/pleroma-fe!1046
| | * Fix follower request fetchinglain2020-01-21
| |/
| * Add domain mutes to changelogShpuld Shpuldson2020-01-15
| |
| * Merge branch 'tae/pleroma-fe-663' into 'develop'Shpuld Shpludson2020-01-15
| |\ | | | | | | | | | | | | Implement domain mutes v2 See merge request pleroma/pleroma-fe!1045
| | * Implement domain mutes v2Shpuld Shpludson2020-01-15
| |/
| * Merge branch '736' into 'develop'Shpuld Shpludson2020-01-15
| |\ | | | | | | | | | | | | | | | | | | Fix "Follow button is out of sync in the about page" Closes #736 See merge request pleroma/pleroma-fe!1035
| | * wire up staff accounts with correct store datataehoon2019-12-15
| | |
| * | change changelog to reflect actual release history of frontendShpuld Shpuldson2020-01-14
| | |
| * | Merge branch 'fix/registration-backend-interactor-fix' into 'develop'Shpuld Shpludson2020-01-14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix #750 , fix error messages and captcha resetting Closes #750 See merge request pleroma/pleroma-fe!1042
| | * | Fix #750 , fix error messages and captcha resettingShpuld Shpludson2020-01-14
| |/ /
| * | Merge branch 'feat/optimize-amount-of-notifs-to-render' into 'develop'Shpuld Shpludson2020-01-14
| |\ \ | | | | | | | | | | | | | | | | Optimize Notifications Rendering See merge request pleroma/pleroma-fe!1041
| | * | Optimize Notifications RenderingShpuld Shpludson2020-01-14
| |/ /
| * | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into developShpuld Shpuldson2020-01-14
| |\ \
| | * \ Merge branch 'fix/fetch-seen-notifs-properly' into 'develop'Shpuld Shpludson2020-01-14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #526: Oldest notifications left unseen when using "Read!" in another tab Closes #526 See merge request pleroma/pleroma-fe!1040
| | | * | Use last seen notif instead of first unseen notif for sinceIdShpuld Shpuldson2020-01-14
| | |/ /
| * / / update CHANGELOGShpuld Shpuldson2020-01-14
| |/ /
* | | remove mock dataShpuld Shpuldson2020-01-26
| | |
* | | change emoji reactions to use new formatShpuld Shpuldson2020-01-26
| | |
* | | clean up code, fix prediction bugShpuld Shpuldson2020-01-14
| | |
* | | fix merge conflictsShpuld Shpuldson2020-01-13
|\| |
| * | Merge branch 'pleroma-amoled-theme' into 'develop'HJ2020-01-07
| |\ \ | | | | | | | | | | | | | | | | Add default pleroma AMOLED dark theme See merge request pleroma/pleroma-fe!1039
| | * | Add AMOLED dark themeSierra2020-01-07
| |/ /
| * | Merge branch 'fix-move-type-notification' into 'develop'HJ2020-01-03
| |\ \ | | | | | | | | | | | | | | | | Fix for move type notification See merge request pleroma/pleroma-fe!1026
| | * \ Merge branch 'develop' into 'fix-move-type-notification'HJ2020-01-03
| | |\ \ | | |/ / | |/| | | | | | # Conflicts: # static/fontello.json
| * | | Merge branch 'mfa_fix' into 'develop'HJ2019-12-30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | mfa fix See merge request pleroma/pleroma-fe!1036
| | * | | mfa fixWyatt Benno2019-12-30
| |/ / /
| * | | Merge branch 'streaming' into 'develop'HJ2019-12-26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Streaming and Backend Interactor service overhaul, removed the need for copypasting See merge request pleroma/pleroma-fe!1012
| | * | | unify showimmideatelyHenry Jameson2019-12-26
| | | | |
| | * | | Some error handlingHenry Jameson2019-12-26
| | | | |
| | * | | Merge remote-tracking branch 'upstream/develop' into streamingHenry Jameson2019-12-26
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (51 commits) toggle_activation api is also deprecated use vuex action refactor toggleActivationStatus replace setActivationStatus api with new one use flex for stickers i18n/update-ja_easy Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled Add fallback in case BE does not report federating status in nodeinfo The value we are looking for is federationPolicy.enabled, not federationPolicy.federating Logic should be to hide TWKN if not federating OR if instance is not public Finally trust eslint More lint More lint Lint mfa: removed unused code increase icon width a little bit in the nav panel add icons to nav panel Revert "Merge branch 'revert-96cab6d8' into 'develop'" Support "native" captcha Revert "Merge branch 'oauth-extra-scopes' into 'develop'" ...
| * | | | Merge branch '716' into 'develop'HJ2019-12-18
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fix "Deactivation of remote accounts from frontend does not work" Closes #716 See merge request pleroma/pleroma-fe!1006
| | * | | toggle_activation api is also deprecatedtaehoon2019-12-15
| | | | |
| | * | | use vuex actiontaehoon2019-12-15
| | | | |
| | * | | refactor toggleActivationStatustaehoon2019-12-15
| | | | |
| | * | | replace setActivationStatus api with new onetaehoon2019-12-15
| |/ / /
| * | | Merge branch 'fix-sticker-height' into 'develop'HJ2019-12-15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | fix sticker picker height in emojo picker See merge request pleroma/pleroma-fe!1022
| | * | | use flex for stickersAbsturztaube2019-12-15
| | | | |
| | * | | fix invisible tab-switcher in emoji pickerAbsturztaube2019-12-09
| | | | |
| | * | | Revert "fix sticker picker height in emojo picker"Absturztaube2019-12-09
| | | | | | | | | | | | | | | | | | | | This reverts commit 914c78398469988f549930bd35d044082d155277.