aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-15
|\ | | | | | | # Conflicts: # src/services/api/api.service.js
| * Merge branch 'new-search' into 'develop'Shpuld Shpludson2019-07-15
| |\ | | | | | | | | | | | | New search See merge request pleroma/pleroma-fe!832
| | * New searchEugenij2019-07-15
| |/
| * Merge branch '482-subscribe-user' into 'develop'HJ2019-07-15
| |\ | | | | | | | | | | | | | | | | | | Implement ability to subscribe to a user Closes #482 See merge request pleroma/pleroma-fe!771
| | * fix wrong eslint commentstaehoon2019-07-12
| | |
| | * add a todo commenttaehoon2019-07-12
| | |
| | * add bell-ringing icontaehoon2019-07-11
| | |
| | * eslint —fixtaehoon2019-07-10
| | |
| | * hide subscribe button unless followingtaehoon2019-07-10
| | |
| | * revert font changetaehoon2019-07-10
| | |
| | * use normal bell for unsubscribed statetaehoon2019-07-10
| | |
| | * update copytaehoon2019-07-10
| | |
| | * improve uitaehoon2019-07-10
| | |
| | * change subscribe button to icon buttontaehoon2019-07-10
| | |
| | * add bell-off font icontaehoon2019-07-10
| | |
| | * clean up + add btn-group css classtaehoon2019-07-10
| | |
| | * clean up layouttaehoon2019-07-10
| | |
| | * clean up UserCard csstaehoon2019-07-10
| | |
| | * clean up UserCard templatetaehoon2019-07-10
| | |
| | * no need to covert to booleantaehoon2019-07-10
| | |
| | * change subscribing to subscribedtaehoon2019-07-10
| | |
| | * update copytaehoon2019-07-10
| | |
| | * support i18ntaehoon2019-07-10
| | |
| | * show subscribe button only if user is logged intaehoon2019-07-10
| | |
| | * mutate updated relationship to the storetaehoon2019-07-10
| | |
| | * show text in progress only when slot is giventaehoon2019-07-10
| | |
| | * add subscribing to user entity normalizertaehoon2019-07-10
| | |
| | * migrate SubscribeButton to the existing common componenttaehoon2019-07-10
| | |
| | * #482 - add subscribe buttonjared2019-07-10
| | |
| | * #482 - add new endpoints to subscribe to the userjared2019-07-10
| |/
| * Merge branch 'csp-header' into 'develop'HJ2019-07-10
| |\ | | | | | | | | | | | | Add Content-Security-Policy header See merge request pleroma/pleroma-fe!856
| | * add csp header to dev servertaehoon2019-07-10
| |/
| * Merge branch '582' into 'develop'Shpuld Shpludson2019-07-10
| |\ | | | | | | | | | | | | Refactor user search api, better api error response handling See merge request pleroma/pleroma-fe!844
| | * Refactor user search api, better api error response handlingTae Hoon2019-07-10
| |/
| * Merge branch '588' into 'develop'HJ2019-07-09
| |\ | | | | | | | | | | | | | | | | | | Sync the counters in Favs and Repeats view and near the buttons Closes #588 See merge request pleroma/pleroma-fe!854
| | * add commentstaehoon2019-07-07
| | |
| | * refetch favs and repeats separatelytaehoon2019-07-07
| | |
| | * refetch favs and repeats when stats are changedtaehoon2019-07-07
| | |
| | * update favs and repeats stats using favoritedByUsers and rebloggedByUsers datataehoon2019-07-07
| |/
| * Merge branch 'fix/console-errors-with-reply-filter' into 'develop'HJ2019-07-07
| |\ | | | | | | | | | | | | Fix console errors in status.js See merge request pleroma/pleroma-fe!875
| | * check for user before checking users propsshpuld2019-07-07
| |/
* / Add thread muting to context menu of statusshpuld2019-07-07
|/
* Merge branch 'eslint-fix' into 'develop'Shpuld Shpludson2019-07-07
|\ | | | | | | | | Fix shitton warning eslint gives See merge request pleroma/pleroma-fe!871
| * all the manual fixesHenry Jameson2019-07-07
| |
| * fix merge conflictHenry Jameson2019-07-06
| |
| * Merge branch 'develop' into 'eslint-fix'HJ2019-07-06
| |\ | | | | | | | | | # Conflicts: # src/components/post_status_form/post_status_form.vue
| * | eslint --fix --ext .js,.vue srcHenry Jameson2019-07-05
| | |
| * | npm eslint --fix .Henry Jameson2019-07-05
| | |
* | | Merge branch 'revoke-token' into 'develop'Shpuld Shpludson2019-07-07
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revoke oAuth token on logout Closes pleroma#952 See merge request pleroma/pleroma-fe!864
| * | | Use target from the settingsEgor Kislitsyn2019-07-06
| | | |