aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* aaaaggghhHenry Jameson2019-03-30
* fix lintHenry Jameson2019-03-30
* Merge remote-tracking branch 'upstream/develop' into minimal-scopes-modeHenry Jameson2019-03-30
|\
| * Merge branch 'issues/#465' into 'develop'Shpuld Shpludson2019-03-29
| |\
| | * update store according to retweeted statusBrenden Bice2019-03-28
| * | Merge branch 'fix/warnings-in-user-profile' into 'develop'Shpuld Shpludson2019-03-29
| |\ \
| | * | Fix: Change conditionjasper2019-03-28
| | * | Remove console logjasper2019-03-26
| | * | Fix warnings in user profile routingjasper2019-03-26
| * | | Merge branch '255-emoji-input' into 'develop'Shpuld Shpludson2019-03-28
| |\ \ \
| | * \ \ Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ...jared2019-03-27
| | |\ \ \
| | * | | | #255 - clean up autocomplete formjared2019-03-26
| | * | | | #255 - clean up user settings page with self-closing html tagsjared2019-03-26
| | * | | | #255 - support textarea and update user settings pagejared2019-03-26
| | * | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ...jared2019-03-26
| | |\ \ \ \
| | * | | | | #255 - add emoji input componentjared2019-03-25
| * | | | | | Merge branch 'feat/gesture-service' into 'develop'Shpuld Shpludson2019-03-28
| |\ \ \ \ \ \
| | * | | | | | fix typoshpuld2019-03-28
| | * | | | | | make side drawer use gesture service and fix its animationsshpuld2019-03-27
| | * | | | | | Add tests for gesture service, fix bug with perpendicular directionsshpuld2019-03-26
| | * | | | | | somewhat functioning gesture serviceshpuld2019-03-25
| | * | | | | | start creating gesture serviceshpuld2019-03-25
| * | | | | | | Merge branch 'issues/#466' into 'develop'Shpuld Shpludson2019-03-28
| |\ \ \ \ \ \ \
| | * | | | | | | display replies_count right after reply iconBrenden Bice2019-03-28
| | * | | | | | | expose replies_count from mastodon apiBrenden Bice2019-03-28
| * | | | | | | | #433 - update sort by for conversationdave2019-03-28
| * | | | | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ...dave2019-03-28
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'fix/convos-masto' into 'develop'HJ2019-03-27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Apparently, MastoAPI gives status in ancestors if you try opening a repeat...Henry Jameson2019-03-27
| | * | | | | | | | | merge develop and resolve conflictdave2019-03-27
| | |\| | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-27
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-27
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Merge branch 'develop' into 'masto-api/direct'HJ2019-03-27
| | | | | |\| | | | | | |
| | | | | | * | | | | | | Merge branch 'mastoapi/friends-tl' into 'develop'HJ2019-03-27
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ | | | | | | |/| | | | | |
| | | | | | | * | | | | | Revert "Merge branch 'revert-987b5162' into 'develop'"Henry Jameson2019-03-27
| | | | | | | | |_|_|/ / | | | | | | | |/| | | |
| | | | | * | | | | | | Merge remote-tracking branch 'upstream/develop' into masto-api/directHenry Jameson2019-03-25
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|/ / / | | | | | | |/| | | | |
| | | | | * | | | | | | Merge remote-tracking branch 'upstream/develop' into masto-api/directHenry Jameson2019-03-21
| | | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | | switch direct messages to mastoapiHenry Jameson2019-03-07
| | | | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-27
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | |
| | | | * | | | | | | | | errataHenry Jameson2019-03-27
| | | | * | | | | | | | | reviewHenry Jameson2019-03-27
| | | | * | | | | | | | | correctly paginate on MastoAPIHenry Jameson2019-03-25
| | | | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-25
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | wip support for follower/following, a bit broken and with regressionHenry Jameson2019-03-10
| | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | review/remove error hidingHenry Jameson2019-03-27
| | | * | | | | | | | | correctly update relationship on follow/unfollowHenry Jameson2019-03-25
| | | * | | | | | | | | fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-25
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-25
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | basic user and status actions implementedHenry Jameson2019-03-10
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | #457 - merge develop and resolve conflictdave2019-03-27
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |