aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix testsHenry Jameson2019-04-28
|
* attempt 2Henry Jameson2019-04-28
|
* Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sassHenry Jameson2019-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 ...
| * Merge branch 'bugfix/in-reply-to-account-acct' into 'develop'HJ2019-04-27
| |\ | | | | | | | | | | | | entity normalizer: hook up in_reply_to_account_acct See merge request pleroma/pleroma-fe!773
| | * entity normalizer: hook up in_reply_to_account_acctWilliam Pitcock2019-04-27
| |/
| * Merge branch 'strings/bbcode' into 'develop'kaniini2019-04-26
| |\ | | | | | | | | | | | | add BBCode strings See merge request pleroma/pleroma-fe!772
| | * add BBCode stringsWilliam Pitcock2019-04-26
| |/
| * Merge branch '492' into 'develop'HJ2019-04-25
| |\ | | | | | | | | | | | | | | | | | | Fix Follow/Mute/Block not functional issue in the user search page Closes #492 See merge request pleroma/pleroma-fe!754
| | * fix follow button not updating bug in follow-cardtaehoon2019-04-22
| | |
| | * refer searched user objects from the global user reptaehoon2019-04-22
| |/
| * Merge branch '500' into 'develop'Shpuld Shpludson2019-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 pagetaehoon2019-04-21
| | |
| * | Merge branch '487' into 'develop'Shpuld Shpludson2019-04-22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Follow Export Closes #487 See merge request pleroma/pleroma-fe!762
| | * | fetch all friends using paginationtaehoon2019-04-19
| | |/
| * | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-04-22
| |\ \ | | | | | | | | | | | | | | | | [i18n] Update for Occitan language See merge request pleroma/pleroma-fe!765
| | * | Update oc.jsonExilat2019-04-20
| | | |
| | * | Update oc.jsonExilat2019-04-20
| | | |
| | * | Update oc.jsonExilat2019-04-20
| | | |
| | * | Update oc.jsonExilat2019-04-20
| | |/
| * | Merge branch '501' into 'develop'Shpuld Shpludson2019-04-22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove space in the timeline setting copy Closes #501 See merge request pleroma/pleroma-fe!763
| | * | Remove space in the timeline setting copytaehoon2019-04-21
| | |/
| * | Merge branch 'change-pencil-to-wrentch' into 'develop'Shpuld Shpludson2019-04-22
| |\ \ | | | | | | | | | | | | | | | | Change pencil icon to wrentch See merge request pleroma/pleroma-fe!764
| | * | replace pencil with wrench iconBrenden Bice2019-04-19
| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/components/user_card/user_card.vue
| | * | rebuild fontello with wrench icon addedBrenden Bice2019-04-19
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # static/font/css/fontello-codes.css # static/font/css/fontello-embedded.css # static/font/css/fontello-ie7-codes.css # static/font/css/fontello-ie7.css # static/font/css/fontello.css # static/font/demo.html # static/font/font/fontello.eot # static/font/font/fontello.svg # static/font/font/fontello.ttf # static/font/font/fontello.woff # static/font/font/fontello.woff2
| * | Merge branch 'bugfix/user-card-emojis-2' into 'develop'Shpuld Shpludson2019-04-22
| |\ \ | | |/ | |/| | | | | | | user_card.vue: Fix .emoji to apply to img See merge request pleroma/pleroma-fe!766
| | * user_card.vue: Fix .emoji to apply to imgHaelwenn (lanodan) Monnier2019-04-20
| |/
| * Merge branch '497' into 'develop'HJ2019-04-18
| |\ | | | | | | | | | | | | | | | | | | Stop fetching user relationship when user is unauthorized Closes #497 See merge request pleroma/pleroma-fe!759
| | * stop fetching user relationship when user is unauthorizedtaehoon2019-04-17
| |/
| * Merge branch '227-bulk-delete' into 'develop'Shpuld Shpludson2019-04-17
| |\ | | | | | | | | | | | | Add "bulk mute/unmute/block/unblock" feature See merge request pleroma/pleroma-fe!733
| | * Revert "recover border between basic-user-card using list component"taehoon2019-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 spacingtaehoon2019-04-17
| | |
| | * code readabilitytaehoon2019-04-17
| | |
| | * fix typostaehoon2019-04-17
| | |
| | * clean uptaehoon2019-04-17
| | |
| | * make sure to use filtered selected keystaehoon2019-04-17
| | |
| | * support indeterminate checkbox statetaehoon2019-04-17
| | |
| | * render span tag only if it has contenttaehoon2019-04-17
| | |
| | * update model and props propertiestaehoon2019-04-17
| | |
| | * import scss variablestaehoon2019-04-17
| | |
| | * update checkbox importing pathtaehoon2019-04-17
| | |
| | * rewrite checkbox component as non-functionaltaehoon2019-04-17
| | |
| | * support i18ntaehoon2019-04-17
| | |
| | * ui improvementstaehoon2019-04-17
| | |
| | * clean uptaehoon2019-04-17
| | |
| | * add bulk mute/unmute buttons and wire up to vuextaehoon2019-04-17
| | |
| | * wire up bulk action buttons to vuextaehoon2019-04-17
| | |
| | * add a commenttaehoon2019-04-17
| | |
| | * show list header only if there are itemstaehoon2019-04-17
| | |
| | * pass down empty slottaehoon2019-04-17
| | |
| | * make border of list header thickertaehoon2019-04-17
| | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-25 13:40:05 +0000