| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass | Henry Jameson | 2019-04-27 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (126 commits) entity normalizer: hook up in_reply_to_account_acct add BBCode strings fix follow button not updating bug in follow-card refer searched user objects from the global user rep set max-width of textarea in settings page Remove space in the timeline setting copy user_card.vue: Fix .emoji to apply to img Update oc.json Update oc.json Update oc.json Update oc.json replace pencil with wrench icon rebuild fontello with wrench icon added fetch all friends using pagination stop fetching user relationship when user is unauthorized Revert "recover border between basic-user-card using list component" remove extra spacing code readability fix typos clean up ... | ||
| | * | entity normalizer: hook up in_reply_to_account_acct | William Pitcock | 2019-04-27 |
| | | | |||
| | * | add BBCode strings | William Pitcock | 2019-04-26 |
| | | | |||
| | * | fix follow button not updating bug in follow-card | taehoon | 2019-04-22 |
| | | | |||
| | * | refer searched user objects from the global user rep | taehoon | 2019-04-22 |
| | | | |||
| | * | Merge branch '500' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| | |\ | | | | | | | | | | | | | | | | | | | Set max-width of textarea in settings page Closes #500 See merge request pleroma/pleroma-fe!761 | ||
| | | * | set max-width of textarea in settings page | taehoon | 2019-04-21 |
| | | | | |||
| | * | | Merge branch '487' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Follow Export Closes #487 See merge request pleroma/pleroma-fe!762 | ||
| | | * | | fetch all friends using pagination | taehoon | 2019-04-19 |
| | | |/ | |||
| | * | | Merge branch 'develop' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| | |\ \ | | | | | | | | | | | | | | | | | [i18n] Update for Occitan language See merge request pleroma/pleroma-fe!765 | ||
| | | * | | Update oc.json | Exilat | 2019-04-20 |
| | | | | | |||
| | | * | | Update oc.json | Exilat | 2019-04-20 |
| | | | | | |||
| | | * | | Update oc.json | Exilat | 2019-04-20 |
| | | | | | |||
| | | * | | Update oc.json | Exilat | 2019-04-20 |
| | | |/ | |||
| | * | | Merge branch '501' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove space in the timeline setting copy Closes #501 See merge request pleroma/pleroma-fe!763 | ||
| | | * | | Remove space in the timeline setting copy | taehoon | 2019-04-21 |
| | | |/ | |||
| | * | | Merge branch 'change-pencil-to-wrentch' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| | |\ \ | | | | | | | | | | | | | | | | | Change pencil icon to wrentch See merge request pleroma/pleroma-fe!764 | ||
| | | * | | replace pencil with wrench icon | Brenden Bice | 2019-04-19 |
| | | |/ | | | | | | | | | | | | | # Conflicts: # src/components/user_card/user_card.vue | ||
| | * / | user_card.vue: Fix .emoji to apply to img | Haelwenn (lanodan) Monnier | 2019-04-20 |
| | |/ | |||
| | * | stop fetching user relationship when user is unauthorized | taehoon | 2019-04-17 |
| | | | |||
| | * | Revert "recover border between basic-user-card using list component" | taehoon | 2019-04-17 |
| | | | | | | | | | | | | | | | | | | | This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc. # Conflicts: # src/components/follow_requests/follow_requests.vue # src/components/user_search/user_search.vue # src/components/who_to_follow/who_to_follow.vue | ||
| | * | remove extra spacing | taehoon | 2019-04-17 |
| | | | |||
| | * | code readability | taehoon | 2019-04-17 |
| | | | |||
| | * | fix typos | taehoon | 2019-04-17 |
| | | | |||
| | * | clean up | taehoon | 2019-04-17 |
| | | | |||
| | * | make sure to use filtered selected keys | taehoon | 2019-04-17 |
| | | | |||
| | * | support indeterminate checkbox state | taehoon | 2019-04-17 |
| | | | |||
| | * | render span tag only if it has content | taehoon | 2019-04-17 |
| | | | |||
| | * | update model and props properties | taehoon | 2019-04-17 |
| | | | |||
| | * | import scss variables | taehoon | 2019-04-17 |
| | | | |||
| | * | update checkbox importing path | taehoon | 2019-04-17 |
| | | | |||
| | * | rewrite checkbox component as non-functional | taehoon | 2019-04-17 |
| | | | |||
| | * | support i18n | taehoon | 2019-04-17 |
| | | | |||
| | * | ui improvements | taehoon | 2019-04-17 |
| | | | |||
| | * | clean up | taehoon | 2019-04-17 |
| | | | |||
| | * | add bulk mute/unmute buttons and wire up to vuex | taehoon | 2019-04-17 |
| | | | |||
| | * | wire up bulk action buttons to vuex | taehoon | 2019-04-17 |
| | | | |||
| | * | add a comment | taehoon | 2019-04-17 |
| | | | |||
| | * | show list header only if there are items | taehoon | 2019-04-17 |
| | | | |||
| | * | pass down empty slot | taehoon | 2019-04-17 |
| | | | |||
| | * | make border of list header thicker | taehoon | 2019-04-17 |
| | | | |||
| | * | add bulk action buttons | taehoon | 2019-04-17 |
| | | | |||
| | * | add reusable progress-button cmoponent | taehoon | 2019-04-17 |
| | | | |||
| | * | replace scope attributes by slot-scope | taehoon | 2019-04-17 |
| | | | |||
| | * | add border-bottom to the header | taehoon | 2019-04-17 |
| | | | |||
| | * | support header slot | taehoon | 2019-04-17 |
| | | | |||
| | * | add header to selectable-list component | taehoon | 2019-04-17 |
| | | | |||
| | * | remove border-bottom of the last list item | taehoon | 2019-04-17 |
| | | | |||
| | * | recover border between basic-user-card using list component | taehoon | 2019-04-17 |
| | | | |||
| | * | show empty slot only if it has content | taehoon | 2019-04-17 |
| | | | |||
