| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'develop' into feature/following_reblogs | Maksim Pechnikov | 2019-10-08 |
| |\ | |||
| | * | fix regex shortcode problem | Henry Jameson | 2019-09-30 |
| | | | |||
| | * | Feature/Add _Allow user discovery services_ preference | Hakaba Hitoyo | 2019-09-26 |
| | | | |||
| | * | Merge branch 'hide-followers-follows-count' into 'develop' | kaniini | 2019-09-26 |
| | |\ | | | | | | | | | | | | | Added a setting to hide follow/follower count from the user profile See merge request pleroma/pleroma-fe!951 | ||
| | | * | Added a setting to hide follow/follower count from the user profile | eugenijm | 2019-09-23 |
| | | | | |||
| * | | | updated user_card | Maksim Pechnikov | 2019-10-08 |
| | | | | |||
| * | | | Merge branch 'develop' into feature/following_reblogs | Maksim Pechnikov | 2019-09-26 |
| |\| | | |||
| | * | | Merge remote-tracking branch 'upstream/develop' into emoji-selector-update | Henry Jameson | 2019-09-25 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (42 commits) Fix formatting in oc.json avoid using global class fix logo moving bug when lightbox is open Reserve scrollbar gap when body scroll is locked setting display: initial makes trouble, instead, toggle display: none using classname lock body scroll add body-scroll-lock directive install body-scroll-lock wire up props with PostStatusModal rename component recover autofocusing behavior refactor MobilePostStatusModal using new PostStatusModal add new module and modal to post new status remove needless condition add mention button wire up user state with global store collapse fav/repeat notifications from muted users do not collapse thread muted posts in conversation detect thread-muted posts do not change word based muting logic ... | ||
| | | * | | Merge branch 'develop' into 'muting-fixes' | rinpatch | 2019-09-16 |
| | | |\| | | | | | | | | | | | | | # Conflicts: # src/components/status/status.js | ||
| | | * | | Set thread_muted for all statuses with the same conversation id on | rinpatch | 2019-09-04 |
| | | | | | | | | | | | | | | | | | status mute/unmute | ||
| | | * | | Properly detect thread-muted posts and set `with_muted` when fetching | rinpatch | 2019-09-04 |
| | | | | | | | | | | | | | | | | | notifications | ||
| | * | | | comment, cleanup and improve autoresize/autoscroll | Henry Jameson | 2019-09-25 |
| | | | | | |||
| | * | | | fix | Henry Jameson | 2019-09-25 |
| | | | | | |||
| | * | | | account for parent padding, too | Henry Jameson | 2019-09-25 |
| | | | | | |||
| | * | | | forgotten file | Henry Jameson | 2019-09-25 |
| | | | | | |||
| | * | | | Remove emoji zoom | Henry Jameson | 2019-09-12 |
| | | | | | |||
| | * | | | better hitbox for status emoji | Henry Jameson | 2019-09-08 |
| | | | | | |||
| * | | | | added support hide\show reblogs from a specific user | Maksim Pechnikov | 2019-09-21 |
| | |_|/ |/| | | |||
| * | | | detect thread-muted posts | taehoon | 2019-09-13 |
| | | | | |||
| * | | | Merge branch 'fix/follow-request-detection' into 'develop' | Shpuld Shpludson | 2019-09-12 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Utilize `user.requested` to display follow request status on user card Closes #635 See merge request pleroma/pleroma-fe!942 | ||
| | * | | | Utilize `user.requested` to display follow request status on user card | rinpatch | 2019-09-05 |
| | | |/ | |/| | | | | | | | Closes #635 | ||
| * | | | refactor toggling body visibility using class | taehoon | 2019-09-06 |
| | |/ |/| | |||
| * | | Merge branch 'mastoapi-externalprofile' into 'develop' | Shpuld Shpludson | 2019-09-06 |
| |\ \ | | | | | | | | | | | | | Replace `/api/externalprofile/show.json` with a MastoAPI equialent See merge request pleroma/pleroma-fe!938 | ||
| | * | | Replace `/api/externalprofile/show.json` with a MastoAPI equialent | rinpatch | 2019-09-03 |
| | |/ | | | | | | | `/api/v1/accounts/:id` supports remote nicknames since pleroma!1622 | ||
| * / | Password reset page | Eugenij | 2019-09-05 |
| |/ | |||
| * | Use mastodon api in follow requests | rinpatch | 2019-09-03 |
| | | |||
| * | Apply suggestion to src/services/follow_manipulate/follow_manipulate.js | rinpatch | 2019-08-09 |
| | | |||
| * | Apply suggestion to src/services/follow_manipulate/follow_manipulate.js | rinpatch | 2019-08-09 |
| | | |||
| * | Apply suggestion to src/services/follow_manipulate/follow_manipulate.js | rinpatch | 2019-08-09 |
| | | |||
| * | Fix sent follow request detection | rinpatch | 2019-08-09 |
| | | | | | | | | This fixes `requestFollow` using the relationship instead of user object, resulting in `sent` always being false for locked users, and also removes assumptions about follow request being sent, instead relying on `requested` from user relationship. | ||
| * | Merge branch 'feat/conversation-muting' into 'develop' | Shpuld Shpludson | 2019-08-08 |
| |\ | | | | | | | | | Add Conversation/Thread Muting See merge request pleroma/pleroma-fe!876 | ||
| | * | Merge branch 'develop' into 'feat/conversation-muting' | Shpuld Shpludson | 2019-07-26 |
| | |\ | | | | | | | | | | | | | # Conflicts: # src/components/extra_buttons/extra_buttons.js # src/components/extra_buttons/extra_buttons.vue | ||
| | * \ | Merge branch 'develop' into 'feat/conversation-muting' | Shpuld Shpludson | 2019-07-15 |
| | |\ \ | | | | | | | | | | | | | # Conflicts: # src/services/api/api.service.js | ||
| | * | | | Add thread muting to context menu of status | shpuld | 2019-07-07 |
| | | | | | |||
| * | | | | Handle JSONified errors while registering | Lee Starnes | 2019-08-06 |
| | | | | | | | | | | | | | | | | | Closes #617 | ||
| * | | | | fix typos | taehoon | 2019-07-24 |
| | |_|/ |/| | | |||
| * | | | fix issues caused by merges in usersearch on @ | shpuld | 2019-07-18 |
| | |/ |/| | |||
| * | | New search | Eugenij | 2019-07-15 |
| | | | |||
| * | | change subscribing to subscribed | taehoon | 2019-07-10 |
| | | | |||
| * | | add subscribing to user entity normalizer | taehoon | 2019-07-10 |
| | | | |||
| * | | #482 - add new endpoints to subscribe to the user | jared | 2019-07-10 |
| | | | |||
| * | | Refactor user search api, better api error response handling | Tae Hoon | 2019-07-10 |
| |/ | |||
| * | Merge branch 'eslint-fix' into 'develop' | Shpuld Shpludson | 2019-07-07 |
| |\ | | | | | | | | | Fix shitton warning eslint gives See merge request pleroma/pleroma-fe!871 | ||
| | * | all the manual fixes | Henry Jameson | 2019-07-07 |
| | | | |||
| | * | npm eslint --fix . | Henry Jameson | 2019-07-05 |
| | | | |||
| * | | Merge branch 'revoke-token' into 'develop' | Shpuld Shpludson | 2019-07-07 |
| |\ \ | | | | | | | | | | | | | | | | | | | Revoke oAuth token on logout Closes pleroma#952 See merge request pleroma/pleroma-fe!864 | ||
| | * | | Revoke oAuth token | Egor Kislitsyn | 2019-07-02 |
| | |/ | |||
| * | | Merge branch '580' into 'develop' | Shpuld Shpludson | 2019-07-07 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix backend version string parsing Closes #580 See merge request pleroma/pleroma-fe!868 | ||
| | * | | update regex for commit hash | taehoon | 2019-07-05 |
| | |/ | |||
| * / | Set hide_follows and hide_followers settings when parsing Mastodon format | Eugenij | 2019-07-07 |
| |/ | |||
 |
index : pleroma-fe.git | |
| This is a fork of pleroma's official FE. Used by vnil.de, we meow meow the meow meow with meow meow | shrik3 |
| aboutsummaryrefslogtreecommitdiff |