aboutsummaryrefslogtreecommitdiff
path: root/src/components
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-26
|\ | | | | | | | | # Conflicts: # src/components/extra_buttons/extra_buttons.js # src/components/extra_buttons/extra_buttons.vue
| * Feature/add sticker pickerabsturztaube2019-07-24
| | | | | | | | Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
| * closest can returns itself as welltaehoon2019-07-23
| |
| * find inside status-content div onlytaehoon2019-07-23
| |
| * try to use the closest a tag as targettaehoon2019-07-23
| |
| * Also apply keyword filter to subjectsToromino2019-07-20
| |
| * fix issues caused by merges in usersearch on @shpuld2019-07-18
| |
| * Add user search atWyatt Benno2019-07-18
| |
| * fix eslint warningstaehoon2019-07-15
| |
| * fix moderation menu partially hidden by usercard boundarytaehoon2019-07-15
| |
| * migrate popper csstaehoon2019-07-15
| |
| * rewrite ModerationTools using v-tooltiptaehoon2019-07-15
| |
| * make popover position for status action dropdow relative to parent nodetaehoon2019-07-15
| |
| * rewrite ExtraButtons using v-tooltiptaehoon2019-07-15
| |
| * Merge branch 'fix/respect-hide-post-stats' into 'develop'HJ2019-07-15
| |\ | | | | | | | | | | | | Hide favs/rts properly when hide post stats is enabled See merge request pleroma/pleroma-fe!877
| | * Hide favs/rts properly when hide post stats is enabledshpuld2019-07-09
| | |
* | | Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-15
|\| | | | | | | | | | | # Conflicts: # src/services/api/api.service.js
| * | New searchEugenij2019-07-15
| | |
| * | 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
| | |
| * | use normal bell for unsubscribed statetaehoon2019-07-10
| | |
| * | update copytaehoon2019-07-10
| | |
| * | improve uitaehoon2019-07-10
| | |
| * | change subscribe button to icon buttontaehoon2019-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
| | |
| * | migrate SubscribeButton to the existing common componenttaehoon2019-07-10
| | |
| * | #482 - add subscribe buttonjared2019-07-10
| | |
| * | Refactor user search api, better api error response handlingTae Hoon2019-07-10
| | |
| * | add commentstaehoon2019-07-07
| | |
| * | refetch favs and repeats separatelytaehoon2019-07-07
| | |
| * | refetch favs and repeats when stats are changedtaehoon2019-07-07
| |/
| * 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