aboutsummaryrefslogtreecommitdiff
path: root/src/services
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into ↵Shpuld Shpludson2019-04-30
|\ | | | | | | | | | | 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' # Conflicts: # src/services/api/api.service.js
| * Merge branch '437-user-profile-settings' into 'develop'HJ2019-04-30
| |\ | | | | | | | | | | | | | | | | | | Transition to MastoAPI: user profile settings Closes #437 See merge request pleroma/pleroma-fe!682
| | * use json content typetaehoon2019-04-27
| | |
| | * Switch to mastoapi for updating user profiletaehoon2019-04-27
| | |
| | * Switch to mastoapi for updating bannertaehoon2019-04-27
| | |
| | * Switch to mastoapi for updating avatartaehoon2019-04-27
| | | | | | | | | | | | | | | # Conflicts: # src/services/api/api.service.js
| * | add “block import” featuretaehoon2019-04-27
| | |
| * | change api function nametaehoon2019-04-27
| | |
| * | move formData generating logic to api.servicetaehoon2019-04-27
| |/
| * entity normalizer: hook up in_reply_to_account_acctWilliam Pitcock2019-04-27
| |
| * fix follow button not updating bug in follow-cardtaehoon2019-04-22
| |
* | Merge branch 'develop' into ↵shpuld2019-04-22
|\| | | | | | | brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
| * fetch all friends using paginationtaehoon2019-04-19
| |
| * store friends/followers in the global user repositorytaehoon2019-04-14
| |
* | refactor showing favs and repeats logicBrenden Bice2019-04-11
| |
* | rename favourite to favoriteBrenden Bice2019-04-11
| |
* | use promisedRequest for api callBrenden Bice2019-04-11
| |
* | fetch reblogged usersBrenden Bice2019-04-11
| |
* | fetch favorited usersBrenden Bice2019-04-11
|/
* #436 - merge developdave2019-04-10
|\
| * Fix wrong localHenry Jameson2019-04-10
| |
| * revert, it's still missingHenry Jameson2019-04-09
| |
| * add support for pleroma-specific fieldsHenry Jameson2019-04-09
| |
* | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-09
|\| | | | | | | issue-436-mastoapi-notifications
| * Merge branch 'fix/notification-bugs' into 'develop'Shpuld Shpludson2019-04-09
| |\ | | | | | | | | | | | | | | | | | | #474 Fix notification bugs Closes #474 See merge request pleroma/pleroma-fe!728
| | * Separate timeline and notificationjasper2019-04-04
| | |
| | * Fix notification bugsjasper2019-04-03
| | |
* | | #436 - merge developdave2019-04-08
|\| |
| * | Added moderation menueugenijm2019-04-01
| |/
* | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-04-02
|\| | | | | | | issue-436-mastoapi-notifications
| * Merge branch 'develop' into feature/mobile-improvements-3shpuld2019-04-01
| |\
| * | remove window width copypastashpuld2019-04-01
| | |
* | | #436 - apply patch and clean updave2019-03-31
| | |
* | | #436 - apply patchdave2019-03-31
| | |
* | | #436 - keep original namingdave2019-03-31
| | |
* | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-03-31
|\ \ \ | | |/ | |/| | | | issue-436-mastoapi-notifications
| * | Merge branch 'fix/warnings-in-user-profile' into 'develop'Shpuld Shpludson2019-03-29
| |\ \ | | |/ | |/| | | | | | | | | | | | | #461 Fix warnings about user-profile Closes #461 See merge request pleroma/pleroma-fe!708
| | * Fix: Change conditionjasper2019-03-28
| | |
| | * Fix warnings in user profile routingjasper2019-03-26
| | |
* | | merge develop & resolve conflictdave2019-03-29
|\| |
| * | Merge branch 'feat/gesture-service' into 'develop'Shpuld Shpludson2019-03-28
| |\ \ | | | | | | | | | | | | | | | | Add a gesture service for easier touch gestures See merge request pleroma/pleroma-fe!714
| | * | fix typoshpuld2019-03-28
| | | |
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show replies count right after reply icon Closes #466 See merge request pleroma/pleroma-fe!716
| | * | | expose replies_count from mastodon apiBrenden Bice2019-03-28
| | | | |
| * | | | merge develop and resolve conflictdave2019-03-27
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: errata review Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' correctly paginate on MastoAPI #442 - update placeholder linebreak #442 - clean up Bio placeholder text wip support for follower/following, a bit broken and with regression switch direct messages to mastoapi switch public and TWKN to MastoAPI undo this change since BE returns empty object for relationship, add in a separate MR updates normalizer for proper user handling and adds support for friends tl via mastoapi
| | | * \ \ \ Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-27
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' switch direct messages to mastoapi switch public and TWKN to MastoAPI