aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into developMaksim Pechnikov2020-01-06
|\
| * 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'" ...
| | * | fix desktop notifications not working with streamingHenry Jameson2019-12-12
| | | |
| | * | fix deletes causing errorsHenry Jameson2019-12-11
| | | |
| | * | Option to enable streamingHenry Jameson2019-12-10
| | | |
| | * | better wrapper for websocketHenry Jameson2019-12-08
| | | |
| | * | Merge remote-tracking branch 'upstream/develop' into streamingHenry Jameson2019-12-08
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Remove whitespace hack on empty post content Change output directory of fontello add html-webpack-plugin to karma config use another fork of fontello-webpack-plugin add animate-spin class remove needless code use another approach for versioning font files versioning the font resources through webpack fix "can't find property of undefined" errors in mrf transparency panel move mention button right next to mute button restore muted users collapsing logic on other user’s profiles
| | * | | Updated streaming and improved error-handling, some more refactoring to apiHenry Jameson2019-12-08
| | | | |
| | * | | improved initial notifications fetchingHenry Jameson2019-11-24
| | | | |
| | * | | initial streaming workHenry Jameson2019-11-24
| | | | |
| | * | | Backend Interactor service overhaul, removed the need for copypastingHenry Jameson2019-11-24
| | | | |
| | | | * remove unused fallbackkPherox2019-12-11
| | | | |
| | | | * Add user migrates filter to interactionskPherox2019-12-11
| | | | |
| | | | * change the expression of `move`kPherox2019-12-11
| | | | |
| | | | * Fix target account linkkPherox2019-12-11
| | | | |
| | | | * Add view for moves notificationskPherox2019-12-11
| | | | |
| | | | * fix parse for move type notificationskPherox2019-12-11
| | | |/
* | | / ddMaksim Pechnikov2019-12-18
|/ / /
* | | 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
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-03 19:12:29 +0000