| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 ... | ||
| | * | Fix formatting in oc.json | Shpuld Shpuldson | 2019-09-25 |
| | | | |||
| | * | Merge branch '616' into 'develop' | Shpuld Shpludson | 2019-09-25 |
| | |\ | | | | | | | | | | | | | | | | | | | Lock body scroll when lightbox is open Closes #616 See merge request pleroma/pleroma-fe!886 | ||
| | | * | avoid using global class | taehoon | 2019-09-20 |
| | | | | |||
| | | * | fix logo moving bug when lightbox is open | taehoon | 2019-09-20 |
| | | | | |||
| | | * | Reserve scrollbar gap when body scroll is locked | taehoon | 2019-09-20 |
| | | | | |||
| | | * | setting display: initial makes trouble, instead, toggle display: none using ↵ | taehoon | 2019-09-20 |
| | | | | | | | | | | | | | classname | ||
| | | * | lock body scroll | taehoon | 2019-09-20 |
| | | | | |||
| | | * | add body-scroll-lock directive | taehoon | 2019-09-20 |
| | | | | |||
| | * | | Merge branch 'develop' into 'develop' | Shpuld Shpludson | 2019-09-25 |
| | |\ \ | | | | | | | | | | | | | | | | | [i18n] Update for the Occitan language file See merge request pleroma/pleroma-fe!901 | ||
| | | * | | Update oc.json | Exilat | 2019-08-03 |
| | | | | | |||
| | | * | | Update for Interactions, new search, sticker picker, update copy. | Exilat | 2019-08-03 |
| | | | | | |||
| | * | | | Merge branch 'es-translate' into 'develop' | Shpuld Shpludson | 2019-09-25 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | [i18n] Update es translate See merge request pleroma/pleroma-fe!944 | ||
| | | * | | | Update es translate | tarteka | 2019-09-06 |
| | | | | | | |||
| | * | | | | Merge branch 'eu-translate' into 'develop' | Shpuld Shpludson | 2019-09-25 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [i18n] update eu translate See merge request pleroma/pleroma-fe!943 | ||
| | | * | | | | fix some translates | tarteka | 2019-09-10 |
| | | | | | | | |||
| | | * | | | | fix some translates | tarteka | 2019-09-07 |
| | | | | | | | |||
| | | * | | | | fix some translates | tarteka | 2019-09-07 |
| | | | | | | | |||
| | | * | | | | update eu translate | tarteka | 2019-09-06 |
| | | |/ / / | |||
| | * | | | | Merge branch '639-2' into 'develop' | Shpuld Shpludson | 2019-09-25 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Mention user" button to user card Closes #639 See merge request pleroma/pleroma-fe!955 | ||
| | | * | | | | wire up props with PostStatusModal | taehoon | 2019-09-20 |
| | | | | | | | |||
| | | * | | | | rename component | taehoon | 2019-09-20 |
| | | | | | | | |||
| | | * | | | | recover autofocusing behavior | taehoon | 2019-09-20 |
| | | | | | | | |||
| | | * | | | | refactor MobilePostStatusModal using new PostStatusModal | taehoon | 2019-09-20 |
| | | | | | | | |||
| | | * | | | | add new module and modal to post new status | taehoon | 2019-09-20 |
| | | | | | | | |||
| | | * | | | | remove needless condition | taehoon | 2019-09-20 |
| | | | | | | | |||
| | | * | | | | add mention button | taehoon | 2019-09-20 |
| | | | |_|/ | | |/| | | |||
| | * | | | | wire up user state with global store | taehoon | 2019-09-20 |
| | | | | | | |||
| | * | | | | collapse fav/repeat notifications from muted users | taehoon | 2019-09-20 |
| | |/ / / | |||
| | * | | | Merge branch 'develop' into 'muting-fixes' | rinpatch | 2019-09-16 |
| | |\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # src/components/status/status.js | ||
| | | * | | | do not collapse thread muted posts in conversation | taehoon | 2019-09-13 |
| | | | | | | |||
| | | * | | | detect thread-muted posts | taehoon | 2019-09-13 |
| | | | | | | |||
| | | * | | | do not change word based muting logic | taehoon | 2019-09-13 |
| | | | | | | |||
| | | * | | | do not collapse muted user's posts on muted user's media timeline | taehoon | 2019-09-13 |
| | | | | | | |||
| | | * | | | do not collapse muted user's posts on muted user's profile page | taehoon | 2019-09-13 |
| | | | | | | |||
| | | * | | | Merge branch 'fix/italics-not-selectable' into 'develop' | Shpuld Shpludson | 2019-09-13 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix italics not being selectable See merge request pleroma/pleroma-fe!952 | ||
| | | | * | | | fix italics not being selectable | Shpuld Shpuldson | 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 | ||
| | | * | | | | | fix some translation about blocks | davidyin | 2019-09-11 |
| | | | | | | | | |||
| | | * | | | | | Complete the Chinese language file based on the version 0.9.999 | davidyin | 2019-09-10 |
| | | | |/ / / | | |/| | | | |||
| | | * | | | | Merge branch '651' into 'develop' | Shpuld Shpludson | 2019-09-09 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Needless context api requests when click timeago in conversation page" Closes #651 See merge request pleroma/pleroma-fe!934 | ||
| | | | * | | | | update prop name | taehoon | 2019-09-06 |
| | | | | | | | | |||
| | | | * | | | | stop fetching whole conversation when change highlighted status | taehoon | 2019-09-06 |
| | | | | | | | | |||
| | | | * | | | | refactoring | taehoon | 2019-09-06 |
| | | | | | | | | |||
| | | | * | | | | update prop binding | taehoon | 2019-09-06 |
| | | | | | | | | |||
| | | | * | | | | accept status id instead of status obj as statusoid prop | taehoon | 2019-09-06 |
| | | | | |/ / | | | |/| | | |||
| | | * / | | | refactor toggling body visibility using class | taehoon | 2019-09-06 |
| | | |/ / / | |||
| | * | | | | Avoid iterating over statuses to set thread_muted if the backend does | rinpatch | 2019-09-04 |
| | | | | | | | | | | | | | | | | | | | | | not support the extension | ||
| | * | | | | Set thread_muted for all statuses with the same conversation id on | rinpatch | 2019-09-04 |
| | | | | | | | | | | | | | | | | | | | | | status mute/unmute | ||
