aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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.
| | * | | fix sticker picker height in emojo pickerAbsturztaube2019-12-07
| | | | |
| * | | | Merge branch 'revert-c2c48ec2' into 'develop'HJ2019-12-14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reinstate `push` and `admin` scopes See merge request pleroma/pleroma-fe!1034
| | * | | | Revert "Merge branch 'revert-96cab6d8' into 'develop'"Ivan Tashkinov2019-12-12
| | | | | | | | | | | | | | | | | | This reverts merge request !1032
| * | | | | Merge branch 'i18b/update-ja_easy' into 'develop'feld2019-12-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n/update-ja_easy See merge request pleroma/pleroma-fe!1002
| | * | | | | i18n/update-ja_easyHakaba Hitoyo2019-12-13
| |/ / / / /
| * | | | | Merge branch 'issue_124' into 'develop'feld2019-12-13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 403 messaging See merge request pleroma/pleroma-fe!1020
| | * | | | | Set error dataWyatt Benno2019-12-09
| | | | | | |
| | * | | | | remove consoleWyatt Benno2019-12-09
| | | | | | |
| | * | | | | Change naming, make more generalWyatt Benno2019-12-09
| | | | | | |
| | * | | | | Wording updatesWyatt Benno2019-12-06
| | | | | | |
| | * | | | | Change 403 messagingWyatt Benno2019-12-05
| | | | | | |
| * | | | | | Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'feld2019-12-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interaction with BE private mode See merge request pleroma/pleroma-fe!989
| | * | | | | | Use a centralized fallback for missing values and use instance.federating ↵Mark Felder2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of instance.federation.enabled
| | * | | | | | Add fallback in case BE does not report federating status in nodeinfoMark Felder2019-12-12
| | | | | | | |
| | * | | | | | The value we are looking for is federationPolicy.enabled, not ↵Mark Felder2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federationPolicy.federating Also the || true fallback does not work and always becomes true
| | * | | | | | Logic should be to hide TWKN if not federating OR if instance is not publicMark Felder2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private instances should not show any timelines
| | * | | | | | Finally trust eslintMark Felder2019-12-12
| | | | | | | |
| | * | | | | | More lintMark Felder2019-12-12
| | | | | | | |
| | * | | | | | More lintMark Felder2019-12-12
| | | | | | | |
| | * | | | | | LintMark Felder2019-12-12
| | | | | | | |
| | * | | | | | Merge branch 'develop' into feature/lockdown-timelines-private-modeMark Felder2019-12-12
| | |\ \ \ \ \ \
| | * | | | | | | side drawer: same treatmentAriadne Conill2019-11-11
| | | | | | | | |
| | * | | | | | | app: search API is not available in private mode so disable itAriadne Conill2019-11-11
| | | | | | | | |
| | * | | | | | | nav panel: disable TWKN if federation disabled, disable Public and TWKN if ↵Ariadne Conill2019-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | privateMode is enabled
| | * | | | | | | nav panel: refactor to use vuex mapStateAriadne Conill2019-11-11
| | | | | | | | |
| | * | | | | | | boot: track whether private mode is enabled or notAriadne Conill2019-11-11
| | | | | | | | |
| | * | | | | | | docs: document FE interaction with the BE private settingAriadne Conill2019-11-11
| | | | | | | | |