| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵ | dave | 2019-04-02 |
| |\ | | | | | | | issue-436-mastoapi-notifications | ||
| | * | Merge branch 'develop' into feature/mobile-improvements-3 | shpuld | 2019-04-01 |
| | |\ | |||
| | | * | Merge branch 'minimal-scopes-mode' into 'develop' | HJ | 2019-04-01 |
| | | |\ | | | | | | | | | | | | | | | | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode See merge request pleroma/pleroma-fe!633 | ||
| | | | * | final touches | Henry Jameson | 2019-03-30 |
| | | | | | |||
| | | | * | aaaaggghh | Henry Jameson | 2019-03-30 |
| | | | | | |||
| | | | * | fix lint | Henry Jameson | 2019-03-30 |
| | | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode | Henry Jameson | 2019-03-30 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (173 commits) Fix: Change condition fix typo update store according to retweeted status #433 - update sort by for conversation display replies_count right after reply icon expose replies_count from mastodon api Apparently, MastoAPI gives status in ancestors if you try opening a repeat... make side drawer use gesture service and fix its animations review/remove error hiding errata review #433 - sort conversation for retweets and clean up Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' Remove console log Fix warnings in user profile routing Add tests for gesture service, fix bug with perpendicular directions #255 - clean up autocomplete form #255 - clean up user settings page with self-closing html tags ... | ||
| | | | * | | Review | Henry Jameson | 2019-03-30 |
| | | | | | | |||
| | | | * | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode | Henry Jameson | 2019-03-03 |
| | | | | | | |||
| | | * | | | #470 - handle cases without subject | jared | 2019-04-01 |
| | | | | | | |||
| | | * | | | #470 - update i18n | jared | 2019-04-01 |
| | | | | | | |||
| | | * | | | #470 - fix subject and content toggle issue | jared | 2019-04-01 |
| | | | | | | |||
| | * | | | | add gesture to close notifications drawer | shpuld | 2019-03-28 |
| | | | | | | |||
| | * | | | | Merge branch 'develop' into feature/mobile-improvements-3 | shpuld | 2019-03-28 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | merge develop in | shpuld | 2019-03-23 |
| | |\ \ \ \ \ | |||
| | * | | | | | | make notifications close on navigation | shpuld | 2019-03-23 |
| | | | | | | | | |||
| | * | | | | | | make mobile notifs drawer more like an actual drawer, make mobile nav ↵ | shpuld | 2019-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buttons bigger to press, fix alert dot | ||
| | * | | | | | | remove notifications from sidebar, make notifications appear on login only | shpuld | 2019-03-14 |
| | | | | | | | | |||
| | * | | | | | | make nav bar slide, move mobile post status to mobile nav | shpuld | 2019-03-14 |
| | | | | | | | | |||
| | * | | | | | | merge develop, add mobile nav component | shpuld | 2019-03-12 |
| | |\ \ \ \ \ \ | |||
| * | | | | | | | | #436 - sync notification & timeline users | dave | 2019-04-01 |
| | | | | | | | | | |||
| * | | | | | | | | #436 - merge develop & resolve conflict | dave | 2019-04-01 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | | Remove useless comma | jasper | 2019-04-01 |
| | | | | | | | | | |||
| | * | | | | | | | Fix user card in notification | jasper | 2019-04-01 |
| | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | | #436 - apply patch and clean up | dave | 2019-03-31 |
| | | | | | | | | |||
| * | | | | | | | #436 - apply patch | dave | 2019-03-31 |
| | | | | | | | | |||
| * | | | | | | | #436 - keep original naming | dave | 2019-03-31 |
| | | | | | | | | |||
| * | | | | | | | #436 - keep original naming | dave | 2019-03-31 |
| | | | | | | | | |||
| * | | | | | | | merge develop & resolve conflict | dave | 2019-03-29 |
| |\| | | | | | | |||
| | * | | | | | | Merge branch '255-emoji-input' into 'develop' | Shpuld Shpludson | 2019-03-28 |
| | |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #255 - add emoji input component Closes #255 See merge request pleroma/pleroma-fe!706 | ||
| | | * | | | | | #255 - clean up autocomplete form | jared | 2019-03-26 |
| | | | | | | | | |||
| | | * | | | | | #255 - clean up user settings page with self-closing html tags | jared | 2019-03-26 |
| | | | | | | | | |||
| | | * | | | | | #255 - support textarea and update user settings page | jared | 2019-03-26 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵ | jared | 2019-03-26 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 255-emoji-input | ||
| | | * | | | | | | #255 - add emoji input component | jared | 2019-03-25 |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'feat/gesture-service' into 'develop' | Shpuld Shpludson | 2019-03-28 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a gesture service for easier touch gestures See merge request pleroma/pleroma-fe!714 | ||
| | | * | | | | | | | make side drawer use gesture service and fix its animations | shpuld | 2019-03-27 |
| | | | | | | | | | | |||
| | | * | | | | | | | somewhat functioning gesture service | shpuld | 2019-03-25 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge branch 'issues/#466' into 'develop' | Shpuld Shpludson | 2019-03-28 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show replies count right after reply icon Closes #466 See merge request pleroma/pleroma-fe!716 | ||
| | | * | | | | | | | | display replies_count right after reply icon | Brenden Bice | 2019-03-28 |
| | | | |_|/ / / / / | | |/| | | | | | | |||
| | * | | | | | | | | #433 - update sort by for conversation | dave | 2019-03-28 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵ | dave | 2019-03-28 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue-433-status-reply-form | ||
| | | * | | | | | | | | Apparently, MastoAPI gives status in ancestors if you try opening a repeat... | Henry Jameson | 2019-03-27 |
| | | |/ / / / / / / | |||
| | * | | | | | | | | #433 - sort conversation for retweets and clean up | dave | 2019-03-27 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵ | dave | 2019-03-27 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue-433-status-reply-form | ||
| | * | | | | | | | | #433 - fix retweet abnormal behavior | dave | 2019-03-25 |
| | | | | | | | | | | |||
| | * | | | | | | | | #433 - consider page on focused | dave | 2019-03-25 |
| | | | | | | | | | | |||
| | * | | | | | | | | #433 - remove needless nesting/bloating | dave | 2019-03-25 |
| | | | | | | | | | | |||
| | * | | | | | | | | #433 - Fix conversation page highlight, fetch conversation on converation page | dave | 2019-03-25 |
| | | | | | | | | | | |||
| | * | | | | | | | | Resolve merge conflict, | dave | 2019-03-25 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | Fix few issues (conversation page highlight, fetch conversation, ...) | ||
