logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
DateCommit messageAuthorFiles+-
themes: Add wavemaster (stole it back from sjw)Haelwenn (lanodan) Monnier2+105-0
themes: Add Sakura-v2Haelwenn (lanodan) Monnier2+159-0
static/styles.json: Add SakuraHaelwenn (lanodan) Monnier1+1-0
Add Monokai-Cybre themeHaelwenn (lanodan) Monnier2+2-2
Have the new background of laura@kirakiratter.comHaelwenn (lanodan) Monnier2+1-1
build.sh: New fileHaelwenn (lanodan) Monnier1+10-0
Merge branch 'feat/timeline-quick-settings' into 'develop'Shpuld Shpludson9+231-34
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+4-3
Merge branch 'feat/sensitive-by-default' into 'develop'Shpuld Shpludson6+13-4
Merge branch 'fix/punycode-buggy' into 'develop'Shpuld Shpludson15+30-26
Merge branch 'fix/dont-crash-on-invalid-notificaiton' into 'develop'Shpuld Shpludson3+30-7
Merge branch 'feat/focus-input-with-emoji-pickers' into 'develop'Shpuld Shpludson5+21-2
Merge branch 'fix-build-warnings' into 'develop'HJ2+5-4
Merge branch 'fix/chat-unread-badge' into 'develop'HJ2+4-3
Merge branch 'fix-vue-warnings-again' into 'develop'Shpuld Shpludson10+31-31
Merge branch 'fix/redline-final-v2' into 'develop'HJ2+1-1
Merge branch 'fix/scroll-lock-jumpiness' into 'develop'Shpuld Shpludson3+17-0
Merge branch 'feat/keep-chat-perf-up' into 'develop'Shpuld Shpludson5+49-0
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson5+119-18
Merge branch 'feat/reason-in-registration' into 'develop'Shpuld Shpludson5+36-4
Merge branch 'fix/poll-type-text-overflow' into 'develop'HJ1+1-0
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+12-4
Merge branch 'chore/mailmap' into 'develop'rinpatch1+2-0
Merge branch 'fix/weblate-conflicts' into 'develop'HJ8+553-123
Merge branch 'fix/usercard-use-general-roles' into 'develop'Shpuld Shpludson6+26-29
Merge branch 'multi-choice-poll-wording' into 'develop'Shpuld Shpludson3+10-1
Merge branch 'fix/localize-bot-label' into 'develop'Shpuld Shpludson2+2-1
Merge branch 'staff-grouping' into 'develop'Shpuld Shpludson4+45-9
Merge branch 'reactbutton-consistency' into 'develop'HJ3+62-46
Merge branch 'fix-otp-login-kbd' into 'develop'HJ7+16-1
Merge branch 'settings-changed' into 'develop'HJ9+214-115
Merge branch 'fix/use-current-app-locale' into 'develop'Shpuld Shpludson3+9-4
Merge branch 'fix-fix-themes' into 'develop'HJ1+1-1
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ5+585-132
Merge branch 'fix/shoutbox-mobile' into 'develop'HJ2+2-1
Merge branch 'fix-p-themes' into 'develop'HJ1+12-3
Merge branch 'fix/convert-more-hyperlinks-to-buttons' into 'develop'Shpuld Shpludson6+36-52
Merge branch 'feat/language-picker-native-names' into 'develop'Shpuld Shpludson3+26-15
Merge branch 'breaking/adminapi-user-deactivated' into 'develop'feld1+6-1
Merge branch 'feat/user-role-i18n' into 'develop'Shpuld Shpludson2+5-2
Merge branch 'chore/backport-release-in-changelog' into 'develop'Shpuld Shpludson1+4-1
Merge branch 'feat/dont-filter-own-posts' into 'develop'Shpuld Shpludson2+4-0
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+4-4
Merge branch 'feat/allow-reporting-status-directly' into 'develop'Shpuld Shpludson7+41-10
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson8+224-121
Merge branch 'fix/punycode-screen-names' into 'develop'Shpuld Shpludson5+197-288
Merge branch 'fix-emoji-sort-chrome' into 'develop'HJ1+2-2
Merge branch 'lang-switcher-zh_Hant' into 'develop'HJ2+4-2
Merge branch 'fix/compat-aarch64-mac' into 'develop'HJ1+1-1
Merge branch 'fix/follows-followers-not-displaying' into 'develop'Shpuld Shpludson2+12-6
Merge branch 'update-changelog-2.2.2' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'plain-bg' into 'develop'HJ15+54-14
Merge branch 'fix/timeline-bar-clickables-offset' into 'develop'Shpuld Shpludson4+27-5
Merge branch 'feat/move-external-source-button-to-extra-buttons' into 'develop'Shpuld Shpludson8+52-28
Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop'Shpuld Shpludson8+52-79
Merge branch 'fix/remote-follow-button-style' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/no-emoji-in-poll-when-voting' into 'develop'Shpuld Shpludson3+4-2
Merge branch 'prevent-textarea-resize-in-bio' into 'develop'HJ4+8-2
Merge branch 'patch-1' into 'develop'HJ1+1-0
Merge branch 'file-limit-info' into 'develop'Shpuld Shpludson4+8-2
Merge branch 'fix/react-button-whoops' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2+863-24
Merge branch 'fix/own-chat-messages-disappearing' into 'develop'lain2+2-1
Merge branch 'fix/use-semantically-correct-buttons' into 'develop'Shpuld Shpludson67+547-445
Merge branch 'feat/react-picker-titles-support-filter-by-emoji' into 'develop'Shpuld Shpludson3+14-2
Merge branch 'feat/add-missing-emoji-and-script' into 'develop'Shpuld Shpludson4+5538-968
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+22-1
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2+90-4
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ6+44-28
Merge branch 'fix/make-autocomplete-wait-for-request-to-finish' into 'develop'Shpuld Shpludson6+106-83
Merge branch 'fix/RED-LINE' into 'develop'HJ3+3-7
Merge branch 'nsfw-link-preview' into 'develop'Shpuld Shpludson4+29-11
Merge branch 'features/video-preload-metadata' into 'develop'HJ1+1-0
Merge branch 'fix/missing-play-circle-icon' into 'develop'HJ1+4-2
Merge branch 'fix/timeline-error-handling-fixes' into 'develop'Shpuld Shpludson11+41-78
Merge branch 'fix-pinned' into 'develop'HJ3+14-5
Merge branch 'feat/favicon-badge' into 'develop'Shpuld Shpludson4+68-0
Merge branch 'chore/update-changelog-to-match-release' into 'develop'Shpuld Shpludson1+5-1
Merge branch 'fix/html-title-name' into 'develop'HJ1+0-1
Merge branch 'fix/field-name-emoji-parsing' into 'develop'HJ3+5-5
Merge branch 'fix/fix-1px-scroll-on-input' into 'develop'Shpuld Shpludson2+2-1
Merge branch 'patch-1' into 'develop'Shpuld Shpludson1+5-0
Merge branch 'patch-1' into 'develop'Shpuld Shpludson1+11-4
Merge branch 'fix/react-menu-overflow-fix' into 'develop'HJ1+8-6
Merge branch 'chat-fix-for-vertical-screen' into 'develop'Shpuld Shpludson3+17-1
Merge branch 'advanced-misclick-guard' into 'develop'Shpuld Shpludson3+11-2
Merge branch 'fix-chat-badge' into 'develop'Shpuld Shpludson6+50-42
Merge branch 'svg-logo' into 'develop'Shpuld Shpludson6+75-3
Merge branch 'chchchchangechangelog' into 'develop'HJ1+10-6
Merge branch 'update-changelog' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/use-ids-for-chat-last-seen' into 'develop'HJ2+7-7
Merge branch 'optimistic-chat-posting' into 'develop'Shpuld Shpludson13+212-44
Merge branch 'various-css-fixes' into 'develop'HJ21+536-456
Merge branch 'fix/chat-misc-fixes' into 'develop'Shpuld Shpludson6+32-12
Merge branch 'fix/block-misclicks-when-timeline-shifts' into 'develop'Shpuld Shpludson3+25-5
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ3+56-31
Merge branch 'fix/extra-buttons-icon-errors' into 'develop'HJ1+0-9
Merge branch 'fontawesome5' into 'develop'HJ123+1679-1176
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+8-7
Merge branch 'fixlainsissueforgood' into 'develop'Shpuld Shpludson2+2-0
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+2-1
Merge branch 'docs_split_up_user_guide' into 'develop'HJ11+266-213
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2+62-54
Merge branch 'fixfontello' into 'develop'HJ1+1-0
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2+7-1
Merge branch 'feat/reorder-emojis-by-position-of-keyword' into 'develop'Shpuld Shpludson2+24-6
Merge branch 'feat/masto-ws-deletes' into 'develop'Shpuld Shpludson11+95-19
Merge branch 'fix/leftover-emoji-checkboxes-in-settings' into 'develop'HJ2+2-2
Merge branch 'fix/nsfw-hider-closing-preview' into 'develop'Shpuld Shpludson2+2-1
Merge branch 'fix/follow-requests-title' into 'develop'Shpuld Shpludson1+3-1
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ9+1439-60
Merge branch 'fix/wait-for-request-before-starting-interval' into 'develop'Shpuld Shpludson8+49-16
Merge branch 'fix/excessive-underline-in-sidebar' into 'develop'Shpuld Shpludson2+14-10
Merge branch 'feat/custom-virtual-scrolling' into 'develop'Shpuld Shpludson21+203-38
Merge branch 'feature/import_export_mutes' into 'develop'Shpuld Shpludson5+60-8
Merge branch 'remove-bio-tables-max-width' into 'develop'Shpuld Shpludson1+1-2
Merge branch 'fix/overflow-for-chat-unread' into 'develop'HJ1+3-0
Merge branch 'fix/case--in-sensitive--emoji--search' into 'develop'HJ1+4-1
Merge branch 'fix/use-shoutbox-name-in-sidedrawer' into 'develop'lain4+8-3
update changelogShpuld Shpuldson1+7-0
Merge branch 'fix-chat-message-list-fetch' into 'develop'Shpuld Shpludson4+26-33
Merge branch 'fix-chat-list-order' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/fix-vue-errors' into 'develop'Shpuld Shpludson3+21-17
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2+222-31
Merge branch 'chat-desktop-notifications-fix' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/locked-account-link-fix' into 'develop'Shpuld Shpludson6+69-12
Merge branch 'fix/autocomplete-fixes' into 'develop'lain3+59-39
Merge branch 'fix/password-reset-behavior' into 'develop'Shpuld Shpludson15+0-19
Merge branch 'fix/hide-polls-in-collapsed-posts' into 'develop'HJ2+7-1
Merge branch 'chore/fix-changelog' into 'develop'Shpuld Shpludson1+23-15
Merge branch 'fix/long-poll-words' into 'develop'lain1+1-0
Merge branch 'fix/user-card-avatar-too-small' into 'develop'lain3+4-4
Merge branch 'fix/fix-tests' into 'develop'lain2+6-5
Merge branch 'support-thumbnails' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain1+2-1
Merge branch 'fix/tag-timeline-title' into 'develop'lain2+12-6
Merge branch 'css-fixes' into 'develop'HJ12+93-22
Merge branch 'fix/treat-field-name-as-text' into 'develop'lain1+4-3
Merge branch 'stylelint-rscss-1' into 'develop'HJ15+1939-539
Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'lain16+315-76
Merge branch 'mobile-setting-modal-fix' into 'develop'Shpuld Shpludson2+17-3
Merge branch 'chat-list-single-line-fix' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'chore/readme-image-link' into 'develop'feld1+1-1
Merge branch 'fix/preview-styles-polish' into 'develop'HJ1+8-8
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ3+255-45
Merge branch 'fix/poll-option-delete' into 'develop'lain1+1-0
Merge branch 'chat-to-shoutbox' into 'develop'HJ2+4-4
Merge branch 'feat/idempotency' into 'develop'lain4+56-34
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ11+367-148
Merge branch 'feat/show-fav-rt-lists-on-hover' into 'develop'Shpuld Shpludson7+134-90
Merge branch 'feat/more-title-attributes-in-status-header' into 'develop'Shpuld Shpludson2+12-2
Merge branch 'desktop-notifications-for-chat' into 'develop'Shpuld Shpludson6+83-49
Merge branch 'features/favicons' into 'develop'Shpuld Shpludson2+12-0
Merge branch 'fix-notification-polling' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/reply-filtering-limit-to-friends-public' into 'develop'lain1+3-1
Merge branch 'reactions-search' into 'develop'Shpuld Shpludson1+4-1
Merge branch 'refactor/notification_settings_more' into 'develop'Shpuld Shpludson2+6-12
Merge branch 'refactor/notification_settings' into 'develop'feld18+11-101
Merge branch 'fix/stabilize-input-bux' into 'develop'HJ1+17-5
Merge branch 'fix-chrome69' into 'develop'Shpuld Shpludson2+23-16
Merge branch 'cleanup/remove-stupid-optns' into 'develop'HJ32+2-68
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ1+42-12
Merge branch 'feat/add-you-to-last-message' into 'develop'HJ2+7-4
Merge branch 'develop' into 'develop'HJ1+1-1
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2+173-17
Merge branch 'fix/ctrl-enter-before-chat-loading-breaks' into 'develop'lain1+1-1
Merge branch 'feat/add-chat-notification-dot-mobilenav' into 'develop'lain2+7-1
Merge branch 'direct-conversations' into 'develop'HJ67+2800-155
Merge branch '888-fix-utf8-base64-decoding' into 'develop'Shpuld Shpludson1+9-1
Merge branch 'fix/notifications-jumping-based-on-time' into 'develop'HJ1+5-0
Merge branch 'patch-1' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'wyatt777/pleroma-fe-issue-353' into 'develop'lain10+153-76
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson3+135-22
Merge branch '884-about-panel-optimizations' into 'develop'Shpuld Shpludson3+9-1
Merge branch 'xenofem/pleroma-fe-rebased-image-description-authoring' into 'develop'Shpuld Shpludson17+186-105
Merge branch '885-fix-preloading-html' into 'develop'Shpuld Shpludson1+2-2
fix preview opening automaticallyShpuld Shpuldson1+1-1
Merge branch 'feat/rich-text-preview' into 'develop'Shpuld Shpludson9+195-36
Merge branch 'fix/remove-extra-notifications-fetch' into 'develop'Shpuld Shpludson4+12-15
Merge branch 'feat/allow-use-without-cookies' into 'develop'Shpuld Shpludson9+178-6
Merge branch 'feat/parent-visible-support' into 'develop'Shpuld Shpludson4+17-2
Merge branch 'fix-emoji-panel-height' into 'develop'HJ1+1-1
Merge branch 'fix/allow-over-scrolling-on-bottom-mobile' into 'develop'HJ1+4-0
Merge branch 'bookmarks' into 'develop'Shpuld Shpludson20+213-24
Merge branch 'fix_BE_1586_provide_index_md' into 'develop'lain2+8-2
Merge branch 'fix/follow-requests-usercard-crash' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/use-backend-reply-filtering' into 'develop'lain9+32-42
Merge branch '812-subject-separation' into 'develop'lain3+86-51
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain1+8-1
Merge branch 'feat/preload-data-from-html' into 'develop'lain1+31-5
Merge branch 'remove-twitterapi-config' into 'develop'Shpuld Shpludson1+37-22
update changelog with profile fieldsShpuld Shpuldson1+1-0
Merge branch 'iss-149/profile-fields-setting' into 'develop'Shpuld Shpludson8+147-3
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2+16-7
Merge branch 'feature/bot-flag' into 'develop'lain6+25-5
Merge branch 'notification-unification-experiments' into 'develop'lain6+134-46
Merge branch 'fix-username-emoji' into 'develop'HJ1+1-1
Merge branch 'iss-149/profile-fields-display' into 'develop'Shpuld Shpludson4+101-0
Merge branch '589-poll-options' into 'develop'Shpuld Shpludson4+20-13
Merge branch 'feat/tweak-autocomplete-search' into 'develop'lain3+7-6
Merge branch 'fix/popovers-cutting-off-in-notifications' into 'develop'Shpuld Shpludson4+12-2
Merge branch 'fix/disable-subject-when-posting' into 'develop'HJ2+2-0
Merge branch 'themes-fixes' into 'develop'HJ10+37-18
Merge branch 'chore/improve-default-tos' into 'develop'lain1+6-1
Merge branch 'depatchou' into 'develop'Shpuld Shpludson6+13-132
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain1+31-2
Merge branch 'fix/attachment-sizing-cover-fix' into 'develop'lain2+3-8
Merge branch 'feature/autocomplete-domain-mutes' into 'develop'Shpuld Shpludson8+79-22
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain2+38-5
Merge branch 'feat/drag-and-drop-improovements' into 'develop'Shpuld Shpludson5+60-25
Merge branch 'half-a-ctrl-press' into 'develop'lain2+2-1
Merge branch 'async-language-loading' into 'develop'HJ5+52-32
Merge branch '572-multiple-file-drag-and-drop' into 'develop'Shpuld Shpludson4+24-11
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ13+6107-5550
Merge branch 'fix-cropped-button-shadow' into 'develop'HJ1+0-1
Merge branch 'settings-modal' into 'develop'HJ68+4809-4089
Merge branch 'fix-reprooted-muted-posts' into 'develop'HJ9+141-37
Update CHANGELOG.mdlain1+6-0
Merge branch '851-fix-squishy-images' into 'develop'Shpuld Shpludson1+10-1
Merge branch '848-change-emoji-reaction-defaults' into 'develop'Shpuld Shpludson1+1-1
Merge branch '790-unable-to-filter' into 'develop'HJ1+6-2
Merge branch '593-doc-change' into 'develop'HJ1+1-1
Merge branch '748-hashtag-link-fixes' into 'develop'HJ1+2-2
Merge branch '788-hide-media-viewer-on-navigation' into 'develop'HJ1+2-0
Merge branch '802-emoji-alt' into 'develop'HJ2+5-5
Merge branch 'update-readme' into 'develop'lain1+2-3
Merge branch 'fix/sidebarRight_option' into 'develop'HJ1+1-0
Merge branch 'fix/favorites-timeline-unsupported-with-muted' into 'develop'HJ1+3-1
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ6+1174-826
Merge branch 'chore/update-docs' into 'develop'feld1+3-0
Merge branch 'feat/sidebar-alignment' into 'develop'Shpuld Shpludson4+12-2
Merge branch 'fix/its-me-elements' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'chore/remote-unused-option' into 'develop'Shpuld Shpludson2+0-2
Merge branch 'feat/add-embed-relationships' into 'develop'lain4+10-6
Merge branch 'resolve-weblate-merge-conflicts' into 'develop'rinpatch3+657-387
Merge branch 'i18n/update-delete-description' into 'develop'HJ1+1-1
Merge branch 'chore/update-config-docs' into 'develop'HJ3+97-83
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson6+2854-2085
update changelogShpuld Shpuldson1+11-0
Merge branch 'feat/relationship-refactor' into 'develop'Shpuld Shpludson24+124-113
Merge branch 'feat/status-content-separation' into 'develop'Shpuld Shpludson4+460-408
Merge branch 'feature/copy-link' into 'develop'Shpuld Shpludson7+32-9
Merge branch 'fix/signup-without-email' into 'develop'Shpuld Shpludson2+17-11
Merge branch 'feat/notification-privacy' into 'develop'Shpuld Shpludson2+15-0
Merge branch 'rc/2.0.3' into 'develop'Shpuld Shpludson0+0-0
Update CHANGELOG.mdShpuld Shpludson1+3-0
Merge branch 'fix/follow-request-notification-bugfixes' into 'develop'Shpuld Shpludson6+72-11
Merge branch 'follow-request-notification' into 'develop'Shpuld Shpludson11+129-20
Update CHANGELOG.mdShpuld Shpludson1+1-1
Merge branch 'fix/remove-with_move-param' into 'develop'Shpuld Shpludson2+1-8
Update CHANGELOG.mdShpuld Shpludson1+6-0
Merge branch 'feature-emoji-length-sorting' into 'develop'Shpuld Shpludson1+18-6
Merge branch 'fix/status-showing-hiding' into 'develop'Shpuld Shpludson1+15-20
Merge branch 'notification-rtl' into 'develop'HJ1+1-1
Merge branch 'fix-pagination' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'chore/2.0.1-changelog' into 'develop'Shpuld Shpludson1+9-0
Merge branch 'develop' into 'develop'Shpuld Shpludson1+310-10
Merge branch 'fix/boosts-favs-private-instance' into 'develop'Shpuld Shpludson1+12-4
Merge branch 'caskd-develop-patch-76396' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/captcha-input' into 'develop'HJ1+3-0
Merge branch 'fix/themes-2.1-opacity-again' into 'develop'HJ1+36-6
mention status preview fix in changelogShpuld Shpuldson1+1-0
Merge branch 'fix/themes-2.1-transparency-pink' into 'develop'Shpuld Shpludson2+3-1
Merge branch 'fix/remove-spinner-on-failed-status-previews' into 'develop'HJ5+20-5
Update CHANGELOG.mdShpuld Shpludson1+1-1
Update CHANGELOG.mdShpuld Shpludson1+3-0
Merge branch 'feat/update-pleroma-themes' into 'develop'Shpuld Shpludson4+421-3
Merge branch 'fix/popover-performance' into 'develop'Shpuld Shpludson20+393-330
stop using customTheme in user card, instead use color slots. fix for opacity inheritance polluting inheritorsHenry Jameson4+24-17
Merge branch 'moderation-menu-fix' into 'develop'Shpuld Shpludson2+9-9
Merge branch 'themes-accent' into 'develop'HJ118+3083-3073
Merge branch 'fix/no-mrf-transparency-crash' into 'develop'Shpuld Shpludson1+8-1
Merge branch 'fix-android-emoji-input' into 'develop'HJ2+14-14
Merge branch 'refactor/i18n-messages-for-mrf-policy-disclosure' into 'develop'Shpuld Shpludson3+57-51
Merge branch 'improve-default-tos' into 'develop'Shpuld Shpludson1+2-5
Merge branch 'feat/emoji-reaction-fixes-improvements' into 'develop'lain18+236-47
Merge branch 'move-type-notification' into 'develop'Shpuld Shpludson8+21-4
Merge branch 'feature-collapsed-media-indicator' into 'develop'Shpuld Shpludson3+32-3
Merge branch 'feature/mrf-keyword-policy-disclosure' into 'develop'Shpuld Shpludson4+63-2
Merge branch 'fix/escape-html' into 'develop'feld3+7-3
Merge branch 'fix/one-click-nsfw-videos' into 'develop'HJ2+9-3
add emoji reactions to changelogShpuld Shpuldson1+1-0
fix emoji reaction classes broken in developShpuld Shpuldson1+3-5
Merge branch 'feat/emoji-reactions' into 'develop'lain12+407-2
Merge branch 'fix-password-and-email-update' into 'develop'HJ1+2-2
Merge branch 'event-target-fix' into 'develop'HJ4+24-0
Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'HJ2+2-2
Merge branch 'fix-follow-requests' into 'develop'Shpuld Shpludson4+4-3
Add domain mutes to changelogShpuld Shpuldson1+1-0
Merge branch 'tae/pleroma-fe-663' into 'develop'Shpuld Shpludson7+263-47
Merge branch '736' into 'develop'Shpuld Shpludson2+6-8
change changelog to reflect actual release history of frontendShpuld Shpuldson1+4-8
Merge branch 'fix/registration-backend-interactor-fix' into 'develop'Shpuld Shpludson5+18-7
Merge branch 'feat/optimize-amount-of-notifs-to-render' into 'develop'Shpuld Shpludson5+30-9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into developShpuld Shpuldson1+3-4
update CHANGELOGShpuld Shpuldson1+16-0
Merge branch 'pleroma-amoled-theme' into 'develop'HJ1+1-0
Merge branch 'fix-move-type-notification' into 'develop'HJ14+65-17
Merge branch 'mfa_fix' into 'develop'HJ1+1-1
Merge branch 'streaming' into 'develop'HJ22+346-301
Merge branch '716' into 'develop'HJ4+41-27
Merge branch 'fix-sticker-height' into 'develop'HJ1+17-17
Merge branch 'revert-c2c48ec2' into 'develop'HJ1+2-2
Merge branch 'i18b/update-ja_easy' into 'develop'feld1+41-2
Merge branch 'issue_124' into 'develop'feld5+47-9
Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'feld8+44-17
Merge branch 'upgrade-babel' into 'develop'HJ6+911-562
Merge branch 'mfa/login_form' into 'develop'HJ5+24-20
Merge branch 'nav-icons' into 'develop'feld3+59-21
Merge branch 'support-native-captcha' into 'develop'HJ1+1-1
Merge branch 'load-button-fix' into 'develop'HJ2+13-13
Merge branch 'revert-96cab6d8' into 'develop'lain1+2-2
Merge branch 'hideSitename' into 'develop'HJ9+13-1
Merge branch 'fix/mfa_routes' into 'develop'rinpatch1+1-1
Merge branch 'oauth-extra-scopes' into 'develop'rinpatch1+2-2
Merge branch 'fix/remove-status-hack' into 'develop'HJ1+1-3
Merge branch 'fix-font-load-for-pleroma-be' into 'develop'HJ1+2-2
Merge branch '701' into 'develop'HJ21+211-1052
Merge branch 'fix/mrf-js-errors' into 'develop'Shpuld Shpludson2+24-11
Merge branch '719' into 'develop'Shpuld Shpludson4+8-3
Merge branch '712' into 'develop'Shpuld Shpludson4+15-17
Merge branch 'i18n/improve-easy-pedantic-japanese-switching-system' into 'develop'HJ2+1-1
Merge branch 'greentext-strikes-back' into 'develop'HJ10+256-13
Merge branch 'iss-149/profile-fields-normalize' into 'develop'Shpuld Shpludson2+22-0
Merge branch 'fix-fetch-follow-request-for-mobile' into 'develop'Shpuld Shpludson5+19-8
Merge branch 'badge-checkbox' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'feature/japanese-translation' into 'develop'Shpuld Shpludson5+332-971
Merge branch 'chore/remove-outdated-changelog' into 'develop'rinpatch1+0-35
Merge branch 'patch-1' into 'develop'rinpatch1+1-1
Merge branch '695' into 'develop'rinpatch1+1-1
Merge branch 'friend-follower-count-display' into 'develop'kaniini3+9-2
Merge branch 'ocd-triggered' into 'develop'kaniini2+18-14
Merge branch '704' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'feature/about-page' into 'develop'kaniini10+230-4
Merge branch 'feature/redirect-external-user-to-id' into 'develop'HJ4+67-0
Merge branch 'emoji-optimizations' into 'develop'HJ16+250-94
Merge branch 'eslint-fix' into 'develop'kaniini2+5-3
Merge branch 'issue_381' into 'develop'Shpuld Shpludson2+32-11
Merge branch 'issue/209-2' into 'develop'kaniini1+5-5
Merge branch 'feature/change-email' into 'develop'kaniini7+83-3
Merge branch 'develop' into 'develop'kaniini2+59-2
Merge branch 'translations-de' into 'develop'kaniini1+40-3
Merge branch 'es-translate' into 'develop'kaniini1+5-1
Merge branch 'develop' into 'develop'HJ1+2-0
Merge branch 'settings-refactor' into 'develop'HJ36+401-649
Merge branch 'eu-translate' into 'develop'Shpuld Shpludson1+23-8
Merge branch '599' into 'develop'Shpuld Shpludson10+184-142
Merge branch 'patch-3' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'improve-gallery-sizing-logic' into 'develop'HJ5+57-37
Merge branch 'modal-scroll-lock' into 'develop'HJ9+106-83
Merge branch 'issue/684' into 'develop'HJ3+10-53
Merge branch 'fix/accessibility-reply-highlight' into 'develop'HJ1+5-0
Merge branch 'feature/require-password-reset' into 'develop'HJ5+27-3
Update CHANGELOG.mdHJ1+2-0
Merge branch 'feature/following_reblogs' into 'develop'HJ12+264-131
Merge branch 'es-translate' into 'develop'HJ1+15-0
Merge branch 'issue/679' into 'develop'HJ2+4-6
Merge branch 'docs/add-links' into 'develop'HJ2+4-4
Merge branch 'docs-sync' into 'develop'rinpatch1+11-0
Merge branch 'admin-link' into 'develop'HJ18+63-25
Merge branch 'fix-regex-normalizer' into 'develop'kaniini2+14-1
Merge branch 'i18n/update-ja_pedantic' into 'develop'Shpuld Shpludson1+24-0
Merge branch 'i18n/update-ja' into 'develop'Shpuld Shpludson1+25-1
Merge branch '672' into 'develop'Shpuld Shpludson2+23-5
Merge branch 'refactor-who-to-follow' into 'develop'kaniini1+2-12
Merge branch 'feature/add-discoverable-preference' into 'develop'kaniini6+14-0
Merge branch 'hide-followers-follows-count' into 'develop'kaniini6+37-1
Merge branch 'emoji-selector-update' into 'develop'HJ46+1503-522
Fix formatting in oc.jsonShpuld Shpuldson1+34-35
Merge branch '616' into 'develop'Shpuld Shpludson8+100-14
Merge branch 'develop' into 'develop'Shpuld Shpludson1+22-4
Merge branch 'es-translate' into 'develop'Shpuld Shpludson1+14-1
Merge branch 'eu-translate' into 'develop'Shpuld Shpludson1+29-16
Merge branch '639-2' into 'develop'Shpuld Shpludson15+273-204
Merge branch '657' into 'develop'Shpuld Shpludson3+128-93
Merge branch 'muting-fixes' into 'develop'Shpuld Shpludson3+15-6
Merge branch '656' into 'develop'Shpuld Shpludson7+14-4
Merge branch 'fix/italics-not-selectable' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/follow-request-detection' into 'develop'Shpuld Shpludson3+7-12
Merge branch 'develop' into 'develop'Shpuld Shpludson1+430-13
Merge branch '651' into 'develop'Shpuld Shpludson4+35-30
Merge branch '648-2' into 'develop'Shpuld Shpludson2+8-4
Merge branch 'mastoapi-externalprofile' into 'develop'Shpuld Shpludson4+2-15
Merge branch 'password-reset' into 'develop'Shpuld Shpludson8+226-0
Merge branch '655' into 'develop'HJ1+2-0
Merge branch 'patch-2' into 'develop'HJ1+1-1
Merge branch 'mastoapi-follow-reqs' into 'develop'HJ1+7-6
Merge branch '652' into 'develop'Shpuld Shpludson2+7-11
Merge branch 'patch-1' into 'develop'Shpuld Shpludson1+46-46
Merge branch 'fix/attachment-css' into 'develop'Shpuld Shpludson2+3-1
Merge branch 'docs' into 'develop'HJ3+398-0
Merge branch 'remove-dead-code' into 'develop'Shpuld Shpludson1+0-3
Merge branch 'fix-user-avatar-fallback' into 'develop'Shpuld Shpludson2+2-2
Merge branch '650' into 'develop'HJ1+1-0
Merge branch 'remove-dead-code' into 'develop'HJ1+0-23
Merge branch '646' into 'develop'Shpuld Shpludson1+1-1
Merge branch '645' into 'develop'Shpuld Shpludson2+6-2
Merge branch '640' into 'develop'Shpuld Shpludson5+8-5
Merge branch 'feature/noscript-message' into 'develop'Shpuld Shpludson1+2-1
Merge branch 'fix/chat-issues' into 'develop'Shpuld Shpludson7+17-30
Merge branch 'eu-translate' into 'develop'Shpuld Shpludson2+612-0
Merge branch 'es-translate' into 'develop'Shpuld Shpludson1+10-10
Merge branch 'update-nb' into 'develop'Shpuld Shpludson1+423-17
Merge branch 'i18n/update-japanese' into 'develop'Shpuld Shpludson1+16-1
Merge branch 'i18n/update-pedantic-japanese' into 'develop'Shpuld Shpludson1+16-1
Merge branch 'telugu-translation' into 'develop'Shpuld Shpludson2+353-0
Merge branch '564' into 'develop'Shpuld Shpludson7+89-74
Merge branch 'fix/fix-link-to-external-users-in-who-to-follow-page' into 'develop'HJ1+2-1
Merge branch '293' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix-chrome-logo' into 'develop'Shpuld Shpludson4+106-8
Merge branch '638' into 'develop'Shpuld Shpludson3+6-11
Merge branch '637' into 'develop'HJ1+1-0
fix js error on muteshpuld1+0-2
Merge branch 'fix/incorrect-follow-request-status' into 'develop'HJ2+11-20
Merge branch 'fix/text-dont-media-viewer' into 'develop'HJ1+1-1
fix extra buttons merge bugshpuld1+0-1
Merge branch '632' into 'develop'Shpuld Shpludson1+6-2
Merge branch '631' into 'develop'Shpuld Shpludson2+15-1
Merge branch '627' into 'develop'Shpuld Shpludson4+10-7
Merge branch 'feat/conversation-muting' into 'develop'Shpuld Shpludson8+68-5
Merge branch 'issue-617' into 'develop'HJ3+40-15
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+3-0
Merge branch '618' into 'develop'Shpuld Shpludson15+94-23
Merge branch 'focus-on-search-input' into 'develop'Shpuld Shpludson1+5-0
Merge branch '626' into 'develop'Shpuld Shpludson1+1-0
Merge branch '549' into 'develop'HJ6+74-26
Merge branch 'feature/add-sticker-picker' into 'develop'HJ8+210-4
Merge branch '587' into 'develop'Shpuld Shpludson1+15-7
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+115-3
Merge branch '592' into 'develop'Shpuld Shpludson1+2-5
Merge branch 'fix/keyword-filter' into 'develop'kaniini1+2-1
Remove files I accidentally pushed inshpuld2+0-0
fix issues caused by merges in usersearch on @shpuld5+19-3
Merge branch 'add-user-search-at' into 'develop'Shpuld Shpludson3+22-5
Merge branch '609' into 'develop'HJ10+141-142
Merge branch 'fix/respect-hide-post-stats' into 'develop'HJ2+6-1
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+5-0
Merge branch 'revert-0a7c60c3' into 'develop'Shpuld Shpludson1+0-3
Merge branch 'i18n/update-pedantic-japanese-traslation' into 'develop'Shpuld Shpludson1+51-2
Merge branch 'i18n/update-japanese-trasnlation' into 'develop'Shpuld Shpludson1+51-2
Merge branch 'new-search' into 'develop'Shpuld Shpludson18+502-224
Merge branch '482-subscribe-user' into 'develop'HJ26+212-146
Merge branch 'csp-header' into 'develop'HJ1+3-0
Merge branch '582' into 'develop'Shpuld Shpludson7+31-79
Merge branch '588' into 'develop'HJ2+35-5
Merge branch 'fix/console-errors-with-reply-filter' into 'develop'HJ1+3-2
Merge branch 'eslint-fix' into 'develop'Shpuld Shpludson145+5259-2567
Merge branch 'revoke-token' into 'develop'Shpuld Shpludson3+50-9
Merge branch '580' into 'develop'Shpuld Shpludson2+12-1
Merge branch '600-2' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'preserve-follows-followers-visibility-settings' into 'develop'Shpuld Shpludson2+10-0
Merge branch 'fix-hmr' into 'develop'Shpuld Shpludson1+7-2
Merge branch '602' into 'develop'Shpuld Shpludson4+8-5
Merge branch 'develop' into 'develop'Shpuld Shpludson1+33-11
Merge branch '603' into 'develop'Shpuld Shpludson1+9-10
Merge branch 'fix-android-emoji-autocompletion' into 'develop'HJ1+8-0
Merge branch 'fix-emoji-input' into 'develop'HJ2+16-7
Merge branch 'fix/gallery-margin-fix' into 'develop'Shpuld Shpludson1+3-1
Merge branch 'clearer-user-profile-tabs' into 'develop'HJ1+1-1
Merge branch 'timeline-skip-fix' into 'develop'HJ1+3-2
Merge branch '591' into 'develop'HJ1+2-1
Merge branch 'fix/not-all-polls-showing-up' into 'develop'Shpuld Shpludson3+24-21
Merge branch 'fix/move-character-counter' into 'develop'Shpuld Shpludson2+33-6
Merge branch 'fix-token-auth-login' into 'develop'HJ6+16-5
Merge branch 'fix/polls-to-module' into 'develop'Shpuld Shpludson6+96-35
Merge branch 'fix/messed-up-long-polls' into 'develop'Shpuld Shpludson2+10-4
Merge branch '584' into 'develop'HJ1+1-0
Merge branch 'mr-origin-740' into 'develop'HJ1+546-206
Merge branch 'feature/polls-attempt-2' into 'develop'Shpuld Shpludson56+1369-1459
Merge branch 'refactor-emoji-input' into 'develop'HJ10+445-299
Merge branch 'fix-user-search' into 'develop'Shpuld Shpludson1+7-1
Merge branch '573' into 'develop'HJ1+2-0
Merge branch 'fix/minor-fixes-console-warnings-stretching' into 'develop'HJ3+8-1
Merge branch 'mastoapi-login-and-config-fixes' into 'develop'HJ11+35-58
Merge branch 'fix-mfa' into 'develop'lain2+4-1
Merge branch 'masto-register-app-secret' into 'develop'HJ10+156-91
Merge branch 'hotfix-token-auth' into 'develop'HJ1+1-1
Merge branch 'hotfix-user-background' into 'develop'HJ1+21-1
Merge branch 'feature/2fa' into 'develop'HJ32+1654-436
Merge branch 'masto-login-fixes' into 'develop'HJ3+21-5
Merge branch 'update-japanese-translation' into 'develop'HJ2+264-16
Merge branch '547' into 'develop'kaniini6+24-12
Merge branch 'small-improve-of-who-to-follow-panel-layout' into 'develop'HJ1+18-6
Merge branch 'fix/avatars-in-who-to-follow-page-are-missing' into 'develop'HJ1+2-1
Merge branch 'fix/remove-notifications-console-spam' into 'develop'Shpuld Shpludson2+1-2
Merge branch 'feature/notification-controls' into 'develop'kaniini6+77-5
Merge branch 'fix/interactions-i18n' into 'develop'feld1+1-1
Merge branch '543' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix-dropdown' into 'develop'Shpuld Shpludson3+59-59
Merge branch 'i18n/add-pedantic-japanese-2' into 'develop'HJ3+405-1
Merge branch '556' into 'develop'HJ1+1-2
Merge branch 'update-hebrew-transalation' into 'develop'HJ1+213-12
Merge branch 'fix-pipelines' into 'develop'HJ3+3-7
Merge branch 'fetags' into 'develop'HJ3+6-1
Merge branch 'masto-remains' into 'develop'HJ15+110-36
Merge branch 'webpack-4-dart-sass' into 'develop'HJ19+3395-1656
Merge branch 'feature/remove-hypenation' into 'develop'Shpuld Shpludson1+0-1
Merge branch '540' into 'develop'HJ5+42-36
Merge branch '542' into 'develop'HJ2+4-1
Merge branch 'fix/mobile-zoom' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'bugfix/emoji-tooltip' into 'develop'kaniini1+1-1
Merge branch '541' into 'develop'HJ1+7-7
Merge branch 'fix/line-up-text-format-picker' into 'develop'HJ2+3-4
Merge branch '468-pin-status' into 'develop'HJ31+299-89
Merge branch '539' into 'develop'HJ1+10-11
Merge branch 'patch-3' into 'develop'HJ1+1-1
Merge branch '527' into 'develop'HJ4+57-72
Merge branch 'mobile-scope' into 'develop'HJ7+51-3
Merge branch '530' into 'develop'HJ2+9-3
Merge branch 'fix/floating-button' into 'develop'HJ6+49-21
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+12-1
Merge branch '515' into 'develop'Shpuld Shpludson2+3-4
Merge branch '519' into 'develop'Shpuld Shpludson1+1-1
Merge branch '520' into 'develop'Shpuld Shpludson1+9-7
Merge branch '523' into 'develop'Shpuld Shpludson1+2-0
Merge branch '441-reporting' into 'develop'HJ12+372-29
Merge branch 'develop' into 'develop'Shpuld Shpludson1+19-2
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+97-9
Merge branch '516-autoload' into 'develop'Shpuld Shpludson3+10-1
Merge branch '502-notification' into 'develop'Shpuld Shpludson1+22-18
Merge branch 'feat/title-alt-for-avatars' into 'develop'HJ10+33-19
Merge branch 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' into 'develop'HJ11+178-5
Merge branch '437-user-profile-settings' into 'develop'HJ5+66-136
Merge branch '220-import-export-blocks-mutes' into 'develop'HJ9+224-72
Merge branch '509' into 'develop'HJ2+12-7
Merge branch 'bugfix/in-reply-to-account-acct' into 'develop'HJ1+1-2
Merge branch 'strings/bbcode' into 'develop'kaniini4+10-8
Merge branch '492' into 'develop'HJ5+60-58
Merge branch '500' into 'develop'Shpuld Shpludson1+1-0
Merge branch '487' into 'develop'Shpuld Shpludson1+18-5
Merge branch 'develop' into 'develop'Shpuld Shpludson1+38-4
Merge branch '501' into 'develop'Shpuld Shpludson1+1-3
Merge branch 'change-pencil-to-wrentch' into 'develop'Shpuld Shpludson13+49-25
Merge branch 'bugfix/user-card-emojis-2' into 'develop'Shpuld Shpludson1+1-1
Merge branch '497' into 'develop'HJ1+4-2
Merge branch '227-bulk-delete' into 'develop'Shpuld Shpludson20+433-138
Merge branch '494' into 'develop'Shpuld Shpludson2+35-58
Merge branch '489' into 'develop'Shpuld Shpludson3+30-47
Merge branch '227-quick-add' into 'develop'Shpuld Shpludson9+166-3
Merge branch 'issues/pleroma-fe-496-following-follower-error' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'fix-notif-user' into 'develop'HJ1+1-1
Merge branch '480-replies' into 'develop'HJ2+48-33
Merge branch 'restore-yarnlock' into 'develop'HJ1+6711-0
Merge branch 'issue-436-mastoapi-notifications' into 'develop'HJ15+205-6790
Merge branch 'fix-local' into 'develop'HJ1+1-1
Merge branch 'mastoapi/update-extension-support' into 'develop'Shpuld Shpludson1+10-9
Merge branch 'fix-emoji-picker' into 'develop'Shpuld Shpludson1+3-2
Merge branch '486-expand-button' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/prevent-repeated-fetching' into 'develop'Shpuld Shpludson2+8-4
Merge branch 'fix/notification-bugs' into 'develop'Shpuld Shpludson9+53-48
Merge branch 'moderation-menu' into 'develop'Shpuld Shpludson22+697-13
Merge branch 'debug_message' into 'develop'Shpuld Shpludson1+0-1
Merge branch 'issue-469-safe-dm-from-BE' into 'develop'Shpuld Shpludson5+13-4
Merge branch 'feature/mobile-improvements-3' into 'develop'Shpuld Shpludson25+291-78
Merge branch 'develop' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'fix/sending-requests-when-loading' into 'develop'Shpuld Shpludson1+32-13
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+315-18
Merge branch '471-timeline-since-id' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'minimal-scopes-mode' into 'develop'HJ18+158-33
Merge branch '470-toggle-subject-content' into 'develop'HJ3+16-8
Merge branch 'fix/user-card-buttons' into 'develop'Shpuld Shpludson3+11-5
Merge branch 'issues/#465' into 'develop'Shpuld Shpludson1+9-0
Merge branch 'fix/warnings-in-user-profile' into 'develop'Shpuld Shpludson1+1-1
Merge branch '255-emoji-input' into 'develop'Shpuld Shpludson7+262-68
Merge branch 'feat/gesture-service' into 'develop'Shpuld Shpludson4+222-14
Merge branch 'issues/#466' into 'develop'Shpuld Shpludson2+4-3
Merge branch 'issue-433-status-reply-form' into 'develop'Shpuld Shpludson9+102-73
Merge branch 'fix/convos-masto' into 'develop'HJ1+2-2
Merge branch 'issue-457-mastodon-tag-timeline' into 'develop'HJ1+3-3
Merge branch 'mastoapi/actions' into 'develop'HJ3+49-31
Merge branch 'mastoapi/followers' into 'develop'HJ3+38-30
Merge branch 'masto-api/direct' into 'develop'HJ1+2-2
Merge branch 'mastoapi/friends-tl' into 'develop'HJ1+2-2
Merge branch 'fix/add-await-to-login-request' into 'develop'Shpuld Shpludson2+1-4
Merge branch 'mastoapi/public-tl' into 'develop'HJ1+9-4
Merge branch 'revert-987b5162' into 'develop'HJ1+2-2
Merge branch 'mastoapi/friends-tl' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'issue-442-placeholder-fix' into 'develop'HJ3+5-2
Merge branch 'mastoapi/convos' into 'develop'HJ5+41-19
Merge branch 'issue-450-user-data-populate' into 'develop'Shpuld Shpludson1+3-0
Merge branch 'file-paste' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'develop' into 'develop'Shpuld Shpludson1+0-2
Merge branch '435-mastoapi-composing-new-post' into 'develop'HJ5+22-39
Merge branch '227-manage-blocks-mutes' into 'develop'HJ14+127-91
Merge branch 'issue-448-status-text-null' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'issue-452-unfollow-button' into 'develop'Shpuld Shpludson1+13-11
Merge branch 'issue-451-long-user-name' into 'develop'Shpuld Shpludson1+10-2
Merge branch '438-mastoapi-user-search' into 'develop'lambda1+6-3
Merge branch 'issue-449-auto-token-fetch' into 'develop'Shpuld Shpludson1+6-1
Merge branch 'issue-444-remote-follow' into 'develop'Shpuld Shpludson6+51-18
Merge branch 'feature/bypass-avatar-cropper' into 'develop'Shpuld Shpludson4+32-2
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+131-16
Merge branch 'develop' into 'develop'Shpuld Shpludson1+18-18
Merge branch 'feature/version-info' into 'develop'Shpuld Shpludson6+61-4
Merge branch 'patch-1' into 'develop'HJ1+1-1
Merge branch 'mastoapi/emojis' into 'develop'HJ2+86-5
Merge branch 'mastoapi/user-stuff' into 'develop'HJ14+167-107
Merge branch 'bugfix/nodeinfo-post-formats' into 'develop'lambda1+1-0
Merge branch 'afterstore-refactor' into 'develop'lambda2+10-12
Merge branch 'issue-434-plain-text' into 'develop'HJ18+18-18
Merge branch 'afterstore-refactor' into 'develop'lambda2+206-135
Merge branch 'feature/mobile-improvements-2' into 'develop'Shpuld Shpludson8+203-26
Merge branch '382-update-user-settings-icon' into 'develop'Shpuld Shpludson16+36-22
Merge branch 'develop' into 'develop'lambda3+14-4
Merge branch 'i18n-cs' into 'develop'lambda1+8-7
Merge branch 'emoji-limit-profile' into 'develop'HJ1+12-0
Merge branch 'fix/timeline-gaps-when-loading-older-after-showing-new' into 'develop'Shpuld Shpludson2+220-199
Merge branch 'issue-432-dot-key' into 'develop'Shpuld Shpludson2+4-0
Merge branch '420-redo-user-card-content' into 'develop'Shpuld Shpludson18+603-648
Merge branch '415-timeline' into 'develop'Shpuld Shpludson1+3-1
Merge branch 'issue-392-other-user-stale-data' into 'develop'Shpuld Shpludson4+37-19
Merge branch 'fix/remove-posts-immediately-by-blocking-someone' into 'develop'Shpuld Shpludson2+23-4
Merge branch 'fix/gallery-css' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/post-content-type' into 'develop'Shpuld Shpludson12+18-21
Merge branch 'fix/fetch-activities-by-last-id' into 'develop'Shpuld Shpludson2+10-7
Merge branch 'i18n-cs' into 'develop'Shpuld Shpludson4+440-1
Merge branch 'issue-346-auto-post' into 'develop'Shpuld Shpludson1+3-1
Merge branch 'emoji-limit' into 'develop'Shpuld Shpludson1+5-0
Merge branch 'fix/gallery-and-attachment-spacing' into 'develop'Shpuld Shpludson2+1-1
Merge branch '419-avatar-cropper-png' into 'develop'Shpuld Shpludson2+6-6
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+172-61
Merge branch 'develop' into 'develop'Shpuld Shpludson1+326-17
Merge branch 'develop' into 'develop'Shpuld Shpludson1+324-21
Merge branch 'issue-417-profile-tab' into 'develop'Shpuld Shpludson2+4-1
Merge branch 'issue-418-notification-timeago' into 'develop'Shpuld Shpludson2+6-2
Merge branch 'hotfix-replies' into 'develop'Shpuld Shpludson1+2-2
Fix bug in repliesshpuld1+1-1
Merge branch '416-name-font-size' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'feature/improve-status-header-and-spacing' into 'develop'Shpuld Shpludson8+184-123
Merge branch 'fix/fetching-error-by-tag' into 'develop'Shpuld Shpludson1+2-2
Fix JS error when no statuses returnedshpuld1+1-1
Merge branch 'issue-388-request-count-broken' into 'develop'Shpuld Shpludson6+41-13
Merge branch 'issue-410-greyout-checkbox' into 'develop'Shpuld Shpludson1+1-1
Merge branch '398-rewrite-follow-list' into 'develop'Shpuld Shpludson24+288-408
Merge branch '386-display-invalid-user-profile' into 'develop'Shpuld Shpludson6+46-4
Merge branch 'keyboard-binding' into 'develop'Shpuld Shpludson1+7-0
Merge branch 'feature/oauth-tokens-in-settings' into 'develop'Shpuld Shpludson24+192-2
Merge branch 'feat/max-attachments-configurable' into 'develop'Shpuld Shpludson6+21-3
Merge branch 'issue-380-noification-unread' into 'develop'HJ2+13-1
Merge branch 'issue-396-registration-bio-field' into 'develop'HJ2+13-5
Merge branch 'fix/active-user-search-text-field' into 'develop'Shpuld Shpludson4+4-2
Merge branch 'issue-390-load-other-user-media-data' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'issue-389-search-loading-icon' into 'develop'Shpuld Shpludson2+12-2
Merge branch 'fix/fetch-error-when-login' into 'develop'Shpuld Shpludson1+2-0
Merge branch '227-manage-blocks-mutes' into 'develop'Shpuld Shpludson20+617-78
Merge branch 'fix-mutes' into 'develop'HJ1+1-1
Merge branch 'issue-376-no-statuses' into 'develop'Shpuld Shpludson4+9-3
Merge branch 'issue-383-content-type' into 'develop'Shpuld Shpludson2+7-7
Merge branch 'issue-371-user-setting-notification' into 'develop'Shpuld Shpludson3+19-3
Merge branch 'fix/follow-list' into 'develop'Shpuld Shpludson1+3-0
Merge branch 'issue-377-local-user-no-link' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'issue-364-register-freeze' into 'develop'Shpuld Shpludson1+8-2
Merge branch 'issue-344-css-refactor' into 'develop'Shpuld Shpludson4+20-9
Merge branch 'follow-requests-for-locked-accounts' into 'develop'Shpuld Shpludson3+17-1
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into developshpuld3+125-11
Merge branch '256-avatar-crop-popup' into 'develop'Shpuld Shpludson9+203-1124
Merge branch 'patch-pleroma-615' into 'develop'Shpuld Shpludson2+0-0
Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'Shpuld Shpludson8+75-51
Merge branch 'instance-specific-panel' into 'develop'HJ2+3-2
Parameter name changed.lambda1+1-1
Merge branch 'update-japanese-translation' into 'develop'Shpuld Shpludson1+22-6
Merge branch 'issue-361-preview-background' into 'develop'HJ2+6-2
Merge branch 'fix/maximum-call-stack-size-exceeded' into 'develop'HJ1+1-1
Merge branch 'fix-notifs' into 'develop'HJ1+1-1
Merge branch 'revert-2bc1cc9f' into 'develop'HJ6+199-276
Merge branch 'revert-d6f9f34a' into 'develop'HJ1+0-1
Merge branch 'revert-295becd6' into 'develop'HJ2+21-19
Merge branch 'hotfix/issues-in-autocomplete' into 'develop'Shpuld Shpludson2+19-21
Merge branch 'fix-convos' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'issue-341-repeat-auto-scroll' into 'develop'Shpuld Shpludson1+9-6
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+1-0
Merge branch '300-fixed-background-issue' into 'develop'Shpuld Shpludson3+13-6
Merge branch 'fix/profile-banner-preview-width' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'Shpuld Shpludson6+276-199
Merge branch '345-long-username' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'hotfix/open-link' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop'Shpuld Shpludson4+9-5
Merge branch 'issue-332-update-follow-tabs' into 'develop'Shpuld Shpludson6+158-76
Merge branch 'fix/hashtag-opening' into 'develop'Shpuld Shpludson7+121-78
Merge branch 'fix/subject-copying-composition-bug' into 'develop'Shpuld Shpludson1+5-4
Merge branch 'fix-user-profile-background-setting-preview' into 'develop'Shpuld Shpludson1+4-0
Merge branch 'patch-2' into 'develop'Shpuld Shpludson1+10-4
Merge branch 'fix/js-error-in-tag-page' into 'develop'Shpuld Shpludson7+16-25
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'Shpuld Shpludson8+31-5
Merge branch 'fix/show-features-panel-not-working' into 'develop'feld6+6-4
Merge branch 'issue-291-disable-empty-tabs' into 'develop'Shpuld Shpludson2+6-3
Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'HJ8+36-3
Merge branch '287-following-followers-tabs' into 'develop'Shpuld Shpludson2+8-2
Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'Shpuld Shpludson9+43-3
Merge branch 'issue-137-heart-emoji' into 'develop'Shpuld Shpludson1+969-2
Merge branch 'issue-315-csv-export' into 'develop'Shpuld Shpludson3+16-1
Merge branch 'english-login' into 'develop'Shpuld Shpludson1+1-1
Fix repeater html not showing properlyshpuld1+2-3
Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop'Shpuld Shpludson3+21-1
Merge branch 'feature/split-hide-network-fixed' into 'develop'Shpuld Shpludson9+25-12
Merge branch 'patch-1' into 'develop'Shpuld Shpludson1+294-13
Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'Shpuld Shpludson5+9-4
Merge branch 'fix/avatar-link' into 'develop'HJ1+2-2
Merge branch 'issue-316-empty-username' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'issue-138-html-escaping' into 'develop'Shpuld Shpludson1+3-1
Fix mishandled @error in stillImageshpuld3+10-2
Merge branch '309-add-logo-to-hamburger-menu' into 'develop'Shpuld Shpludson2+29-3
Merge branch 'feat/follows-following-pagination' into 'develop'Shpuld Shpludson12+200-85
Merge branch 'issue-154-shorten-cw-subject' into 'develop'Shpuld Shpludson2+11-2
Merge branch 'issue-312-media-upload' into 'develop'Shpuld Shpludson4+17-13
Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop'Shpuld Shpludson2+6-2
Merge branch '275-avatar-placeholder' into 'develop'Shpuld Shpludson13+90-97
Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into 'develop'Shpuld Shpludson1+8-0
Merge branch 'revert-886aa35e' into 'develop'Shpuld Shpludson9+12-25
Merge branch '238-add-avatar-size-suggestion' into 'develop'Shpuld Shpludson2+2-0
Merge branch 'fix/default-inlined-videos' into 'develop'Shpuld Shpludson7+14-17
Merge branch 'fix-max-id-for-notifications' into 'develop'HJ1+1-1
Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/name-field-length-should-be-as-wide-as-the-bio-field' into 'develop'feld1+4-0
Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop'Shpuld Shpludson7+112-76
Merge branch 'fix/statistics' into 'develop'Shpuld Shpludson1+4-4
Merge branch 'patch-1' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/css-margin-adjustments-for-attachments' into 'develop'Shpuld Shpludson2+4-1
Merge branch 'feat/media-modal' into 'develop'lambda36+753-122
Merge branch 'fix/timeline-too-eager-flush' into 'develop'lambda1+3-1
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'lambda10+59-10
Merge branch 'fix/tall-statuses-v2' into 'develop'lambda1+8-5
Merge branch 'fix/reply-to-using-wrong-id' into 'develop'lambda1+1-1
Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'lambda4+88-3
Merge branch 'feature/split-hide-network' into 'develop'Shpuld Shpludson9+25-12
Merge branch 'fix/favorites-timelines-fetching-on-direct-url' into 'develop'lambda1+2-1
Merge branch 'fix/nav-panel-shadow' into 'develop'lambda1+1-0
Merge branch 'fix/dont-connect-ws-when-chat-disabled' into 'develop'lambda3+13-4
Merge branch 'fix/user-by-name-type-error' into 'develop'lambda1+3-1
Merge branch 'feature/link-preview' into 'develop'lambda5+117-6
Merge branch 'fix/tall-status-handling' into 'develop'lambda1+6-4
Merge branch 'fix/make-user-by-name-case-insensitive' into 'develop'lambda2+12-1
Merge branch 'fix/user-timeline-again' into 'develop'lambda2+12-3
Merge branch 'rename-service-worker' into 'develop'Shpuld Shpludson1+2-1
Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop'lambda1+8-3
Merge branch 'fix/add-back-login-error' into 'develop'lambda4+60-28
Merge branch 'fix/fix-warnings' into 'develop'lambda3+4-4
Merge branch 'develop' into 'develop'Shpuld Shpludson2+373-0
Merge branch 'fix-chat' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'fix/following-status-on-usercard' into 'develop'Shpuld Shpludson1+2-0
Merge branch 'feat/better-perf-side-drawer-anim' into 'develop'Shpuld Shpludson1+2-2
Merge branch 'feature/media-timeline' into 'develop'Shpuld Shpludson6+51-0
Merge branch 'hotifx-convos' into 'develop'HJ1+2-2
Merge branch 'hotfix-broken-convos' into 'develop'HJ1+5-5
Merge branch 'hotfix/summary-html' into 'develop'lambda1+2-0
quickfixHenry Jameson3+6-6
Merge branch 'fixSortingSequentials' into 'develop'HJ3+50-4
Merge branch 'fix-custom-nsfw-image' into 'develop'HJ3+41-46
Merge branch 'favorites-fixes' into 'develop'HJ3+31-7
Merge branch 'fix-who-to-follow-panel-shuffling' into 'develop'Shpuld Shpludson1+3-3
Merge branch 'fix/hide-network-setting' into 'develop'HJ1+3-2
Revert "fix reply-to tooltip being somewhat unreliable"HJ3+7-33
fix reply-to tooltip being somewhat unreliableHenry Jameson3+33-7
fix errors in consoleHenry Jameson1+1-1
Merge branch 'favorites' into 'develop'HJ19+2361-252
Merge branch 'referrer-caching-fix' into 'develop'lambda2+4-1
Merge branch 'develop' into 'develop'kaniini1+0-0
Merge branch 'package-updates' into 'develop'lambda1+1539-611
Merge branch 'update-japanese-translation' into 'develop'lambda1+3-0
Merge branch 'feature/show-who-to-follow-in-mobile-view' into 'develop'HJ8+77-11
Merge branch 'summary-html' into 'develop'lambda1+1-1
Merge branch 'reply-detection' into 'develop'lambda1+1-13
Merge branch 'translate-korean' into 'develop'Shpuld Shpludson2+371-0
Merge branch 'fix-265-fix-user-profiles-again' into 'develop'Shpuld Shpludson1+8-8
Merge branch 'fix/user-timeline-not-loading' into 'develop'Shpuld Shpludson2+5-5
Merge branch 'fix-262-load-older' into 'develop'Shpuld Shpludson2+4-4
Merge branch 'feature/add-about-page-for-mobile' into 'develop'Shpuld Shpludson7+60-0
Merge branch 'avoid-duplicates-in-who-to-follow-panel' into 'develop'HJ2+14-12
Merge branch 'develop' into 'develop'Shpuld Shpludson1+171-4
Merge branch 'readme-update' into 'develop'Shpuld Shpludson1+3-2
Merge branch 'fix/captcha-string-typo' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'feature/replace-panel-switcher' into 'develop'Shpuld Shpludson27+488-88
Merge branch 'fix/profile-with-no-statuses-not-loading' into 'develop'HJ4+100-126
Merge branch 'fix/conversation-headings-in-user-profile' into 'develop'HJ1+1-1
Merge branch 'scope-copy-default' into 'develop'HJ1+1-1
Merge branch 'restore-routes' into 'develop'lambda18+58-62
Merge branch 'feature/no-attachment-links' into 'develop'HJ5+9-3
Merge branch 'improve_push' into 'develop'HJ4+33-31
Merge branch 'fix_notifications' into 'develop'Shpuld Shpludson3+109-56
Merge branch 'push_fix' into 'develop'HJ5+75-31
Merge branch 'update-japanese-translation' into 'develop'Shpuld Shpludson1+168-3
Merge branch 'refactor-recommendations' into 'develop'HJ2+38-69
Merge branch 'fix_textfields' into 'develop'HJ1+13-8
Merge branch 'captcha' into 'develop'Shpuld Shpludson3+8-3
Merge branch 'fix_followers' into 'develop'Shpuld Shpludson2+10-5
Merge branch 'remove_favorite_hacks' into 'develop'HJ7+3-54
Merge branch 'fix_defaults' into 'develop'Shpuld Shpludson3+19-3
Merge branch 'user-profile-overhault' into 'develop'HJ10+120-110
Merge branch 'feature/bigger-icons-for-mobile' into 'develop'Shpuld Shpludson12+76-54
Merge branch 'feature/new-user-routes' into 'develop'lambda32+1778-728
Merge branch 'clean-profile' into 'develop'lambda1+2-2
Merge branch 'captcha' into 'develop'Shpuld Shpludson5+32-2
Merge branch 'fix-tab-scroll' into 'develop'Shpuld Shpludson2+40-24
Merge branch 'fix-name' into 'develop'HJ1+1-1
Merge branch 'async_follow' into 'develop'Shpuld Shpludson4+82-4
Merge branch 'fix-hide-network' into 'develop'HJ1+1-1
Merge branch 'fix-preload-nsfw' into 'develop'HJ1+1-1
Merge branch 'search-mobile-fixes' into 'develop'HJ17+90-46
Merge branch 'fix-chrome' into 'develop'HJ1+1-1
Merge branch 'placeholder_for_server_generated_meta' into 'develop'HJ2+3-1
Merge branch 'feature/file-size-checking' into 'develop'HJ9+153-37
Merge branch 'dev_vald_fe/its_you' into 'develop'HJ3+6-2
Merge branch 'collateral-damage-control' into 'develop'Shpuld Shpludson5+21-5
Merge branch 'mobile-back' into 'develop'Shpuld Shpludson5+42-18
Merge branch 'fix/reset-follows-export' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'Shpuld Shpludson2+4-1
Merge branch 'fix_loading_flicker' into 'develop'Shpuld Shpludson1+3-2
Merge branch 'dev-qol' into 'develop'Shpuld Shpludson8+58-9
Merge branch 'fix_empty_profiles' into 'develop'Shpuld Shpludson2+22-1
Merge branch 'hide_network' into 'develop'Shpuld Shpludson4+46-25
Merge branch 'fix-timeago' into 'develop'HJ1+1-1
Merge branch 'feature/push-subscriptions' into 'develop'HJ13+213-21
Merge branch 'fix-scope-copy' into 'develop'HJ1+1-1
Merge branch 'dev_vald_fe/user_name_panel' into 'develop'HJ1+3-3
Merge branch 'dev_vald_fe/nsfw_preload' into 'develop'HJ6+19-3
Merge branch 'dev_vald_fe/timeago_panel' into 'develop'HJ7+16-13
Merge branch 'dev_vald_fe/user_panel_counts' into 'develop'HJ1+1-1
Merge branch 'feature/theming2' into 'develop'HJ60+4336-736
Merge branch 'hideISP' into 'develop'lambda7+26-4
Merge branch 'better_errors_on_registration' into 'develop'HJ8+241-1050
Merge branch 'fix_alwaysSubject' into 'develop'HJ1+2-0
Merge branch 'fix/user-settings-switch' into 'develop'Henry5+5-4
Merge branch 'feld-ios_video' into 'develop'Henry1+1-1
Merge branch 'dev_vald_fe/post_delete' into 'develop'Henry2+4-1
Merge branch 'target_blank_profile' into 'develop'lambda2+9-1
Merge branch 'dev_vald_fe/tooltip' into 'develop'Henry2+3-2
Merge branch 'dev_vald_fe/be' into 'develop'Henry9+23-16
Merge branch 'fix-vimium' into 'develop'lambda1+1-1
Merge branch 'subject-line-entry-auto' into 'develop'lambda9+29-2
Merge branch 'ss-read' into 'develop'lambda4+26-10
Merge branch 'fix-user-profile-glitches' into 'develop'lambda3+16-5
Merge branch 'file-type-service-fix' into 'develop'lambda1+2-2
Merge branch 'fix/user-search-profile-link' into 'develop'lambda2+4-2
Merge branch 'logout_on_password_change' into 'develop'lambda1+5-0
Merge branch 'fix/switch-to-timeline-on-mobile' into 'develop'lambda3+9-8
Merge branch 'feature/scope_preferences' into 'develop'Henry11+82-7
Merge branch 'update-japanese-translation' into 'develop'Henry1+4-0
Merge branch 'fix/dm-timeline-streaming' into 'develop'lambda1+8-0
Merge branch 'feature/user-search' into 'develop'lambda8+103-22
Merge branch 'french-translation' into 'develop'kaniini1+10-6
Merge branch 'dm-tab' into 'develop'lambda7+31-1
Merge branch 'oauth' into 'develop'lambda19+1411-243
remove deploy stageRoger Braun1+0-32
remove deploy stageRoger Braun1+0-1
Merge branch 'patch-1' into 'develop'lambda1+2-2
Merge branch 'i18n/irish' into 'develop'lambda3+213-0
Merge branch 'develop' into 'develop'lambda1+60-9
Merge branch 'develop' into 'develop'lambda2+203-1
Fix posting.Roger Braun1+1-0
Merge branch '153-count-cw' into 'develop'lambda1+6-3
Merge branch 'fix-features-panel' into 'develop'Henry1+5-3
Merge branch 'develop' into 'develop'Henry1+10-0
Merge branch 'patch-1' into 'develop'Henry1+163-19
Merge branch 'undefined' into 'develop'Henry1+82-14
Merge branch 'instance-setting-fallback' into 'develop'Henry2+12-5
Merge branch 'sorted-messages' into 'develop'Henry1+10-9
Merge branch 'i18n/arabic' into 'develop'Henry2+203-0
Merge branch 'catalan' into 'develop'Henry3+211-1
Merge branch 'hide-statistics' into 'develop'kaniini12+59-10
Merge branch 'update-nb' into 'develop'Henry1+89-9
Merge branch 'i18n/no_rich_text' into 'develop'kaniini2+2-1
Merge branch 'fix/i18n/instance_default' into 'develop'Henry2+2-2
Merge branch 'fixup_french_translation' into 'develop'Henry1+15-14
Merge branch 'update-japanese-translation' into 'develop'Henry1+68-29
Merge branch 'update/french-translation' into 'develop'kaniini1+63-3
Merge branch 'feature/rich-text-optout' into 'develop'kaniini5+11-3
Merge branch 'betterStorage' into 'develop'Henry19+318-172
Merge branch 'translations-separation' into 'develop'Henry19+2191-2150
Merge branch 'fixAutocomplete' into 'develop'kaniini1+5-2
Merge branch 'patch-1' into 'develop'Henry1+61-4
Merge branch 'debug-who-to-follow-panel' into 'develop'Henry1+1-1
Merge branch 'feature/update-de-translation' into 'develop'Henry1+22-17
Merge branch 'pizzaiolo/pleroma-fe-patch-1' into 'develop'Henry1+55-38
Merge branch 'develop' into 'develop'Henry1+17-3
Merge branch 'post-polish-fixes' into 'develop'kaniini8+54-36
Merge branch 'remove-outdated-settings' into 'develop'kaniini1+0-6
Merge branch 'simplify-sensitivity-label' into 'develop'kaniini2+2-4
Merge branch 'prime-number-step-for-who-to-follow-panel' into 'develop'kaniini1+5-7
Merge branch 'feature/features-panel' into 'develop'Henry6+72-3
Revert "Update messages.js"Henry1+3-17
Update messages.js Update the Occitan language - Fixed LintingArtik Banana1+17-3
Merge branch 'patch-1' into 'develop'Henry1+1-1
Merge branch 'imvomitingasicodethisshit' into 'develop'Shpuld Shpludson5+10-2
Merge branch 'fix/put-sense-into-rich-text-styles' into 'develop'Shpuld Shpludson1+24-0
Merge branch 'fixup/post-status-styling' into 'develop'kaniini2+12-5
Merge branch 'polish' into 'develop'kaniini33+867-451
Merge branch 'bugfix/fetch-friends-id' into 'develop'kaniini1+1-1
Merge branch 'post-button-labels' into 'develop'kaniini2+12-3
Merge branch 'feature/rich-text' into 'develop'kaniini6+31-10
Merge branch 'emoji-shortcode-startswith' into 'develop'kaniini1+2-2
Merge branch 'remove-unused-settings' into 'develop'kaniini1+0-5
Merge branch 'serverside-frontend-configuration-2' into 'develop'kaniini1+70-56
Merge branch 'reply-preserve-subject' into 'develop'kaniini3+10-2
Merge branch 'attachment-collapse' into 'develop'kaniini2+11-2
Merge branch 'language-override' into 'develop'kaniini9+64-5
Merge branch 'nsfw-attachment-marking' into 'develop'kaniini5+13-3
attachment: add support for rendering alt text on imagesWilliam Pitcock1+1-1
Merge branch 'notifications' into 'develop'kaniini14+276-191
Merge branch 'reply-visibility' into 'develop'kaniini7+62-2
Merge branch 'feature/who-to-follow-panel-uses-suggestions-api' into 'develop'kaniini5+38-32
Merge branch 'easy-japanese' into 'develop'kaniini2+97-61
Merge branch 'feature/update-russian-translation' into 'develop'kaniini1+8-1
Merge branch 'center-bios' into 'develop'kaniini1+7-3
Revert "Unify button styles and use min-width"William Pitcock4+11-2
Merge branch 'cw-clickthrough' into 'develop'kaniini8+60-19
Merge branch 'feature/theme-export-import' into 'develop'kaniini7+92-28
Merge branch 'fixes-and-tweaks' into 'develop'kaniini23+320-128
Merge branch 'user_settings_tabs' into 'develop'kaniini3+32-11
Merge branch 'feature/default-scope' into 'develop'kaniini6+52-23
Merge branch 'invites' into 'develop'lambda5+18-4
Merge branch 'feature/accountHighlight' into 'develop'lambda25+263-66
Merge branch 'feature/focus_reply_form' into 'develop'lambda1+4-0
Merge branch 'fixSelectOptionStyling' into 'develop'lambda2+11-1
Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop'lambda1+13-2
Merge branch 'fixRelativeEmojis' into 'develop'lambda2+4-3
Merge branch 'feature/emoji-in-profiles' into 'develop'lambda5+19-7
Merge branch 'fix/remove-retweet-button-on-private-and-direct-posts' into 'develop'lambda3+4-4
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"dtluna1+2-2
Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'dtluna1+2-2
Merge branch 'revert-88c9ab44' into 'develop'lambda5+8-50
Merge branch 'cw-clickthrough' into 'develop'lambda5+50-8
Merge branch 'patch-1' into 'develop'lambda1+3-3
Merge branch 'feature/status-scope-improvements-translation' into 'develop'lambda1+10-1
Merge branch 'feature/status-scope-improvements' into 'develop'lambda2+40-6
Merge branch 'feature/unrepeats' into 'develop'lambda3+16-0
Use parents scope if available.Roger Braun2+4-3
Merge branch 'feature/update-de-translation' into 'develop'lambda1+17-2
Merge branch 'feature/update-russian-translation' into 'develop'lambda1+14-1
Merge branch 'improve-settings-ui' into 'develop'lambda2+13-9
Merge branch 'patch-1' into 'develop'lambda1+1-0
Merge branch 'feature/locked-accounts' into 'develop'lambda14+135-13
Merge branch 'i18n/change-content-warning-to-subject' into 'develop'lambda1+1-1
Merge branch 'tr-fix' into 'develop'lambda2+16-1
Merge branch 'l10n-french-newsettings' into 'develop'lambda1+14-3
Merge branch 'develop' into 'develop'lambda1+135-1
Merge branch 'dr1ft/pleroma-fe-develop' into developRoger Braun8+67-10
Update translation.Roger Braun1+16-2
Merge branch 'feature/change-password' into 'develop'lambda6+80-16
Display visibility if available.Roger Braun14+90-19
Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletionRoger Braun5+72-29
Added delete account section to user settingsSyldexia5+58-4
Merge branch 'fix/moreCssFixesAndStuff' into 'develop'lambda15+113-75
Merge branch 'feature/who-to-follow-panel-configurable' into 'develop'lambda6+175-3
Merge branch 'develop' into 'develop'lambda1+1-0
Merge branch 'develop' into 'develop'lambda1+120-0
Merge branch 'nb' into 'develop'lambda1+120-1
Merge branch 'feature/redirect-root-by-login-or-not' into 'develop'lambda2+9-2
Add message preset functionality.Roger Braun1+2-1
Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loadingRoger Braun3+4-4
Update timeline.jslambda1+1-1
Stop blink from loading more statuses with every scroll.csaurus1+2-1
Merge branch 'patch-4' into 'develop'Shpuld Shpludson1+5-5
Merge branch 'patch-5' into 'develop'Shpuld Shpludson1+29-8
Merge branch 'fix/follow-import-typo' into 'develop'lambda1+1-1
Merge branch 'fix/no-nsfw-in-repeats' into developshpuld1+3-0
some ugly hack to prevent the jump in form height when you input first charactershpuld1+4-1
Merge branch 'patch-4' into 'develop'Shpuld Shpludson1+21-10
Merge branch 'fix/additionalInputboxHeightUpdates' into 'develop'Shpuld Shpludson2+29-10
Merge branch 'patch-3' into 'develop'Shpuld Shpludson1+5-4
Additional check to make console shut upshpuld1+1-1
I broke timelines again, fixed now again (hopefully).shpuld1+11-7
Whoops, broke older statuses accidentallyshpuld1+4-1
Merge branch 'fix/add-back-timeline-id-overlap' into developshpuld1+2-2
Force oembeds to use 100% widthshpuld2+8-1
Fix rt heading alignment againshpuld1+2-2
Merge branch 'develop' into fix/status-heading-alignment-issuesshpuld3+44-122
Fix alignment issues in status heading and repeat infoshpuld1+15-1
Also fix wrong color in user cardshpuld1+0-1
change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally.shpuld19+160-27
Fix long names in notifications tooshpuld1+5-0
Fix overflowing long maes in statuses and repeats.shpuld1+17-1
Merge branch 'feature/update-russian-translation' into 'develop'lambda1+17-2
Update polish translation (thanks, roka!)Roger Braun1+43-7
Merge branch 'patch-3' into 'develop'lambda1+8-3
Fix status preview loader having different offset from the actual stats previewshpuld1+6-4
Fix missing border radii and read button text colorshpuld3+13-5
Merge branch 'feature/update-de-translation' into 'develop'lambda1+17-2
Merge branch 'patch-2' into 'develop'lambda1+11-0
Merge branch 'ja-translation' into 'develop'lambda1+23-7
aha, found another bug in oembed textshpuld1+1-0
Remove some commented lines and logsshpuld3+0-6
Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein.shpuld12+50-41
Merge branch 'fix/autocomplete-case-insensitive' into 'develop'Shpuld Shpludson1+2-1
Merge branch 'feature/chat-styling-and-hiding' into 'develop'Shpuld Shpludson2+43-18
Merge branch 'feature/rewrite-status-and-notifications-and-preview' into 'develop'Shpuld Shpludson12+531-433
Merge branch 'feature/link-to-remote-user-profile-page' into 'develop'Shpuld Shpludson1+3-0
Merge branch 'cssOverhaul' into 'develop'Shpuld Shpludson48+1768-1295
Merge branch 'ja-translation' into 'develop'lambda1+38-15
Merge branch 'Exilat_a_Tolosa/pleroma-fe-patch-1' into developRoger Braun1+107-3
Merge branch 'patch-1' into 'develop'lambda1+12-11
Merge branch 'stillGifs' into 'develop'lambda14+184-17
Merge branch 'fix/typerror-in-delete-button' into 'develop'lambda1+1-1
Merge branch 'update-ger-translation' into 'develop'lambda1+7-3
Use less busy default background.Roger Braun4+4-4
Merge branch 'feature/i18n-for-user-timeline' into 'develop'lambda3+8-2
Merge branch 'develop' into 'develop'eal1+2-1
Merge branch 'feature/user-picker-keyboard-support' into 'develop'eal2+59-12
Merge branch 'feature/forbid-posting-when-status-length-is-over-the-limit' into 'develop'lambda2+6-1
Merge branch 'feature/russian-translation' into 'develop'lambda1+102-1
Merge branch 'feature/instance-specific-panel' into 'develop'lambda6+41-4
Merge branch 'feature/post-length-indicator' into 'develop'lambda4+32-5
Merge branch 'update-es-translation' into 'develop'lambda1+20-3
Merge branch 'fix/component-list-keys' into 'develop'eal2+3-3
Merge branch 'theme-edit-color-fields' into 'develop'eal1+53-26
Update vue version.Roger Braun3+1661-1541
Fix typo in fav/rt fixshp1+1-1
Fix fav/RT buttons in notifications.eal1+2-2
Merge branch 'fix/chat-visibility' into 'develop'lambda2+2-2
Merge branch 'remote-follow-button' into 'develop'lambda3+27-1
Merge branch 'fix/emoji-align' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/show-fav-and-rt-counts' into 'develop'Shpuld Shpludson5+24-18
Merge branch 'feature/normal-emoji-completion' into 'develop'lambda4+21-5
Merge branch 'develop' into 'develop'Shpuld Shpludson2+19-2
Move chat to sidebar.Roger Braun10+97-91
Merge branch 'update-ger-translation' into 'develop'eal1+5-1
Merge branch 'feature/follow-import' into 'develop'lambda6+71-5
Merge branch 'fixImgOrient' into 'develop'eal1+1-0
Merge branch 'feature/update-de-translation' into 'develop'lambda1+4-0
Merge branch 'fix/hide-read-button' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'fix/gs-emoji-error' into 'develop'eal1+13-7
Merge branch 'fix/usercard-width' into 'develop'eal1+1-3
Merge branch 'feature/chat' into 'develop'eal13+175-6
Merge branch 'fix/unicode-passwords' into 'develop'lambda1+11-1
Merge branch 'clipboardImage' into 'develop'Shpuld Shpludson2+9-1
Merge branch 'fix/notifications-star-not-colored' into 'develop'eal2+5-1
Merge branch 'fix/mobile-layout' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/give-icons-active-colors-back' into 'develop'Shpuld Shpludson3+3-3
Merge branch 'feature/flush-timeline-with-holes' into 'develop'lambda5+48-13
Merge branch 'fix/better-icon-colors' into 'develop'lambda7+22-19
Merge branch 'fix/dont-stretch-panel-switcher' into 'develop'lambda1+8-11
Merge branch 'feature/configurable-default-path' into 'develop'Shpuld Shpludson2+38-36
Merge branch 'fix/fix-usercard-breaking-with-certain-colors-restructure' into 'develop'lambda8+119-96
Merge branch 'fix/attachment-fixes-media-upload-unknown-type' into 'develop'lambda3+4-2
Merge branch 'fix/style-fixes-again' into 'develop'lambda4+13-19
Fix mention timeline.Roger Braun1+1-1
Merge branch 'update-de-translation' into 'develop'Shpuld Shpludson1+9-2
Merge branch 'feature/custom-theme' into 'develop'lambda19+285-44
Merge branch 'fix/timeline-softlock' into 'develop'lambda1+1-0
Merge branch 'feature/update-de-translation' into 'develop'Shpuld Shpludson1+29-3
Merge branch 'fix/user-view-without-posts' into 'develop'Shpuld Shpludson4+21-2
Update README.md with a more modern picture.Shpuld Shpludson1+1-1
Merge branch 'fix/user-finder-leading-@' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/hotfix-for-reply-navigation' into 'develop'Shpuld Shpludson1+1-10
Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'lambda4+33-2
Merge branch 'feature/in-reply-to-preview-on-timeline' into 'develop'lambda4+84-60
Merge branch 'french-update' into 'develop'lambda1+43-18
Merge branch 'fix/replace-sidepanel-scroll-js-with-css' into 'develop'lambda3+16-33
Merge branch 'fix/persisted-stream-setting' into 'develop'Shpuld Shpludson1+1-0
Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'lambda3+7-9
Merge branch 'fix/sidepanel-gap-consistency-fix' into 'develop'lambda3+29-3
Merge branch 'feature/streaming-posts' into 'develop'lambda7+55-4
Merge branch 'fix-css-notif-button' into 'develop'Shpuld Shpludson1+5-2
Merge branch 'web-notifs' into 'develop'Shpuld Shpludson2+23-0
Merge branch 'css-fixes-and-updates' into 'develop'Shpuld Shpludson6+35-22
Merge branch 'develop' into 'develop'Shpuld Shpludson1+85-1
Merge branch 'fix/dont-show-block-when-logged-out' into 'develop'lambda1+2-2
Merge branch 'fix/pleromabe-is-other-user' into 'develop'Shpuld Shpludson1+1-1
Merge branch 'feature/timeago-locales' into 'develop'lambda7+1-67
Merge branch 'fix/dont-show-rts-more-than-once' into 'develop'lambda1+8-2
Merge branch 'ro-translation' into 'develop'lambda1+110-1
Add spanish translation.Roger Braun1+85-1
Merge branch 'fix/i18n-mentions-timeline-title' into 'develop'lambda1+1-1
Merge branch 'feature/timeago-locales' into 'develop'lambda9+81-4
Merge branch 'develop' into 'develop'lambda1+24-1
Merge branch 'fix/attachment-fixes' into 'develop'lambda1+3-1
Merge branch 'develop' into 'develop'lambda1+22-0
Update polandish.Roger Braun1+24-1
Merge branch 'fix/missing-localization-strings' into 'develop'lambda10+72-26
Merge branch 'develop' into 'develop'lambda1+61-0
Merge branch 'fix/polish-user-finder-and-nav-buttons' into 'develop'lambda3+18-7
Add Polish translation.Roger Braun1+62-1
Unify statuses/notices.Roger Braun1+1-1
Merge branch 'tibike/pleroma-fe-hu-translation' into developRoger Braun1+59-0
Fix typo.Roger Braun1+1-1
Add italian translation.Roger Braun1+60-1
Add french translation.Roger Braun1+60-1
Merge branch 'feature/blocks' into 'develop'lambda4+54-0
Merge branch 'feature/ger-translation' into 'develop'lambda1+53-1
Update ja translation.Roger Braun1+1-1
Japanese is ja.Roger Braun1+2-2
Add japanese translation.Roger Braun1+60-1
Merge branch 'feature/fi-language' into 'develop'lambda1+59-0
update readmeRoger Braun1+0-6
Add translation to readme.Roger Braun1+4-0
Set locale from browser settings.Roger Braun1+3-1
Prepare for i18n.Roger Braun11+142-52
Merge branch 'fix/friendica-html' into 'develop'lambda1+9-0
Merge branch 'fix/authenticated-remote-profile-fetching' into 'develop'lambda2+3-2
Merge branch 'fix/update-readme-new-repo' into 'develop'lambda1+2-2
Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'lambda1+8-2
Merge branch 'fix/disable-select-on-icons' into 'develop'lambda1+5-0
Update .gitlab-ci.ymllambda1+1-3
Merge branch 'feature/emoji-completion' into 'develop'lambadalambda4+30-5
Merge branch 'feature/tag-timelines' into 'develop'lambadalambda7+66-10
Merge branch 'fix/set-cookie' into 'develop'lambadalambda1+2-0
Merge branch 'feature/login-with-cookie' into 'develop'lambadalambda3+7-2
Merge branch 'fix/upload-buttons-clickable' into 'develop'lambadalambda2+3-0
Merge branch 'fix/responsive-user-search' into 'develop'lambadalambda3+35-4
Merge branch 'feature/follow-notif-tests' into 'develop'lambadalambda1+36-0
Merge branch 'fix/timeago-months' into 'develop'lambadalambda1+1-1
Merge branch 'fix/usercard-css' into 'develop'Shpuld Shpuldson1+2-2
Merge branch 'fix/pleromabe-follow-notifs' into 'develop'Shpuld Shpuldson1+3-1
Merge branch 'feature/post-status-clear-error-message' into 'develop'Shpuld Shpuldson2+15-0
Merge branch 'fix/style-fixes-user-profile' into 'develop'Shpuld Shpuldson3+20-20
Merge branch 'feature/follow-lists' into 'develop'Shpuld Shpuldson11+226-26
Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop'lambadalambda1+4-1
Merge branch 'fix/user-card-changes-and-fixes' into 'develop'lambadalambda1+11-11
Merge branch 'fix/double-post-with-ctrl-enter' into 'develop'Shpuld Shpuldson1+1-0
Merge branch 'fix/profile-link-in-usercard' into 'develop'Shpuld Shpuldson1+6-2
Merge branch 'fix/use-full-res-avatar-in-usercard' into 'develop'lambadalambda1+1-1
Merge branch 'fix/lock-submit-until-post-returns' into 'develop'lambadalambda3+10-1
Merge branch 'fix/avatar-clickable-areas' into 'develop'lambadalambda2+10-9
Merge branch 'feature/post-status-errors' into 'develop'lambadalambda3+33-13
Merge branch 'feature/profile-editing' into 'develop'lambadalambda10+303-53
Merge branch 'fix/pleromabe-favs-generate-notifs' into 'develop'lambadalambda1+2-1
Merge branch 'fix/user-finder-updates-user-timeline' into 'develop'lambadalambda1+6-0
Merge branch 'feature/follow-notifications' into 'develop'lambadalambda3+20-0
Merge branch 'fix/user-card-visual-buggery' into 'develop'lambadalambda1+20-14
Add fetch polyfill.Roger Braun3+7-1
Add back relative numbering.Roger Braun1+3-1
Only run through replies once.Roger Braun1+15-12
Revert "Throttle getReplies so it isn't called that often."Roger Braun1+15-17
Throttle getReplies so it isn't called that often.Roger Braun1+17-15
Fix too long words in profile.Roger Braun1+2-0
Add logout button.Roger Braun15+45-19
Hotfix for JS error in auto completion in firefox.Shpuld Shpuldson1+1-1
Merge branch 'feature/registration' into 'develop'lambadalambda13+357-10
Merge branch 'feature/slicker-buttons' into 'develop'lambadalambda4+26-13
Use tags array in status if available.Roger Braun1+7-3
Loop videos.Roger Braun1+1-1
Merge branch 'feature/completion' into 'develop'lambadalambda5+217-4
Fix meta-enter hotkey on osxShpuld Shpuldson1+1-1
Update vue.Roger Braun2+16-16
Fix notification deletion.Roger Braun2+19-16
Don't use too advanced features.Roger Braun1+3-1
Fetch user from timeline.Roger Braun1+5-1
Use userId in timeline.Roger Braun2+7-4
Clear timeline on user change.Roger Braun2+16-0
Display user timelineRoger Braun3+12-6
Start fetching user timelines.Roger Braun7+55-16
Fix race condition in color calculation.Roger Braun1+7-4
Merge branch 'feature/reply-previews' into 'develop' Reply previews in conversations See merge request !89lambadalambda8+80-11
Don't crash on unknown status deletion.Roger Braun1+4-0
Remove notifications for deleted messages.Roger Braun2+32-0
Merge branch 'feature/two-way-reply-navigation' into 'develop' Feature/two way reply navigation See merge request !88lambadalambda4+33-10
Merge branch 'feature/toggleable-user-finder-navbar' into 'develop' Feature/toggleable user finder navbar See merge request !87lambadalambda16+81-35
Merge branch 'feature/autoloading-when-scrolled-to-bottom' into 'develop' Hotfix for firefox to prevent loading on every scroll event. See merge request !86Shpuld Shpuldson1+2-1
Merge branch 'feature/autoloading-when-scrolled-to-bottom' into 'develop' Automatic loading/infinite scrolling See merge request !85lambadalambda5+17-0
Key notifications so the open reply windows won't switch places.Roger Braun1+1-1
Merge branch 'feature/tooltips-for-notifications-repeats' into 'develop' User name tooltips for notifications and repeats See merge request !84lambadalambda2+4-4
Merge branch 'feature/status-improvement-cleanup' into 'develop' Status improvements and cleanup See merge request !83lambadalambda2+141-94
Merge branch 'feature/autoresize-post-status-form' into 'develop' Make text input grow to a minimum height of 3 lines on focus See merge request !82lambadalambda2+10-1
Merge branch 'feature/notification-improvements' into 'develop' Feature/notification improvements See merge request !79lambadalambda5+48-12
Merge branch 'feature/custom-timestamps' into 'develop' Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' See merge request !80lambadalambda2+11-1
Merge branch 'feature/autoresize-post-status-form' into 'develop' Make post-status-form textarea automatically resize to fit the input. See merge request !81lambadalambda2+9-4
Copy cool retweet look.Roger Braun1+19-2
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun3+1-68
Add user finder.Roger Braun6+49-3
Merge branch 'feature/post-form-improvement' into 'develop' Polish up post-status form See merge request !78lambadalambda1+8-6
Merge branch 'fix/floating-attachment-remove-x' into 'develop' Fix the floating 'remove attachment' icon on post status form. See merge request !77Shpuld Shpuldson1+4-0
Merge branch 'fix/add-explicit-lang-to-html' into 'develop' Fix / add explicit lang="en" to html See merge request !75lambadalambda1+1-1
Add missing route-link end tags.Roger Braun1+2-2
Merge branch 'feature/reply-navigation' into 'develop' Reply navigation fix for opening conversations in new tab See merge request !74lambadalambda1+1-1
Merge branch 'feature/sidepanel-independent-scrolling' into 'develop' Sidepanel independent scrolling See merge request !72lambadalambda4+45-9
Merge branch 'fix/remove-ghost-scrolling-mobile' into 'develop' Change attachments margin to not cause the element to overflow. See merge request !73lambadalambda1+2-2
Merge branch 'feature/custom-default-styles' into 'develop' New default dark/light themes See merge request !71lambadalambda5+70-2
Merge branch 'feature/reply-navigation' into 'develop' Reply navigation (up only) See merge request !70lambadalambda4+44-9
Merge branch 'fix/daily-avg' into 'develop' Fix daily average on accounts younger than a day See merge request !69lambadalambda1+2-3
Merge branch 'feature/filtering' into 'develop' Feature/filtering See merge request !68lambadalambda7+64-18
Add chrome picture stretching fix back in.lambadalambda1+1-1
Merge branch 'fix/attachment-sizing' into 'develop' Fix/attachment sizing See merge request !67Shpuld Shpuldson3+9-4
Merge branch 'fix/small-buttons-chrome-tweak' into 'develop' Fix the appearance of 'Read'/'Show new' buttons on Chrome See merge request !65Shpuld Shpuldson2+5-2
Merge branch 'feature/daily-avg' into 'develop' Add a daily post average to the user card See merge request !63Shpuld Shpuldson1+11-1
Merge branch 'fix/consistency-for-attachment-borders' into 'develop' Give link attachments a rounded border, give images and links base03 border. See merge request !64Shpuld Shpuldson1+9-10
Merge branch 'fix/make-nav-panel-not-so-bright' into 'develop'lambadalambda1+5-5
Merge branch 'fix/conversation-heading-border' into 'develop'lambadalambda1+8-1
Merge branch 'wakarimasen/pleroma-fe-develop' into 'develop' Wakarimasen/pleroma fe develop See merge request !55Shpuld Shpuldson8+32-9
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun5+22-29
Fix localforage warning.Roger Braun1+1-0
Merge branch 'feature/timeline-fetch-error' into 'develop' Use one error variable for all timelines See merge request !57Shpuld Shpuldson4+17-26
Merge branch 'feature/borders-pleasing-to-the-eye' into 'develop' Feature/borders pleasing to the eye See merge request !56lambadalambda7+20-8
Merge branch 'feature/nav-panel-hover-state' into 'develop' themeable hover states for nav-panel See merge request !53lambadalambda1+23-10
Merge branch 'feature/animated-favorite-and-boost' into 'develop' add a spin animation to favorite and boost actions See merge request !52lambadalambda4+28-6
Merge branch 'cleanups' into 'develop' Cleanups See merge request !54lambadalambda2+8-1
Merge branch 'xj9/pleroma-fe-feature/even-better-nsfw-image-loading' into developRoger Braun2+29-13
Merge branch 'feature/failed-login-error' into 'develop' Visual feedback on failed login See merge request !49Shpuld Shpuldson3+63-32
Merge branch 'feature/timeline-fetch-error' into 'develop' Move rejection handler See merge request !48Shpuld Shpuldson1+4-3
Merge branch 'feature/performance' into 'develop' Feature/performance See merge request !50lambadalambda5+43-19
Don't redirect after login.Roger Braun1+1-3
Merge branch 'feature/timeline-fetch-error' into 'develop' Visual feedback on failure to fetch new statuses See merge request !47Shpuld Shpuldson3+33-6
Merge branch 'feature/more-visible-notifications' into 'develop' Notifications inside a red circle and the red line more visible See merge request !46lambadalambda2+16-2
Merge branch 'fix/collapse-on-same-line' into 'develop' Put conversation 'Collapse' back on the same line with the rest of the heading.' See merge request !45lambadalambda1+3-3
Merge branch 'fix/highlight-expanded-retweets' into 'develop' Highlight original notice when expanding retweets See merge request !43lambadalambda2+6-2
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun3+11-10
Switch to localforage to use indexeddb by default.Roger Braun3+114-47
Revert "Temporarily remove persistence."Roger Braun1+12-0
Temporarily remove persistence.Roger Braun1+0-12
Merge branch 'feature/load-new-statuses-in-heading' into 'develop' Improvements in loading statuses interface See merge request !42lambadalambda7+57-28
Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop' Wakarimasen/pleroma fe highlight notice See merge request !41lambadalambda6+21-6
Merge branch 'feature/better-nsfw-image-loading' into 'develop' issue #1 - better nsfw image loading See merge request !37lambadalambda2+6-1
Merge branch 'feature/restructure-timelines' into 'develop' Unify notice timelines to make changes easier. See merge request !36Shpuld Shpuldson7+34-43
Merge branch 'fix/improved-profile-background-color' into 'develop' Make use of template literals instead of string concat. See merge request !34lambadalambda1+2-4
Merge branch 'fix/remove-unread-notifications-offset' into 'develop' Fix the very visible padding offset in unread notification caused by the border. See merge request !35lambadalambda1+10-5
Merge branch 'fix/improved-profile-background-color' into 'develop' Make the profile background use a new calculated color using the theme See merge request !33lambadalambda1+5-2
Merge branch 'fix/various-style-fixes-all-over-the-place' into 'develop' Fix/various style fixes all over the place See merge request !32lambadalambda8+118-66
Switch to lz-string.Roger Braun3+9-15
Indentation.Roger Braun1+4-2
Merge branch 'hae/pleroma-fe-develop' into developRoger Braun6+22-9
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun4+131-85
Revert "Show actual status in notifications when mentioned."Roger Braun5+53-61
Add setting to hide all attachments.Roger Braun6+20-3
Show actual status in notifications when mentioned.Roger Braun5+61-53
More eslint fixes.Roger Braun3+4-4
Style fixes.Roger Braun2+3-3
Merge branch 'feature/drag_and_drop_for_media_upload' into 'develop' Proper handling of drag/drop for most platforms See merge request !28lambadalambda4+19-2
Set colors into config so they can be used for more dynamic styles.Roger Braun2+22-11
Merge branch 'fix/dont_display_following_when_logged_out' into 'develop' Hide Follow-button and 'Follows you' text when not logged in Closes #14 See merge request !27lambadalambda1+7-4
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun3+30-8
Only save every minute.Roger Braun1+1-1
Better attachment removal styling.Roger Braun1+10-1
Remove flex from general attachments.Roger Braun1+1-3
Update vue-style-loader.Roger Braun1+1-1
Use runtime only build.Roger Braun2+2-3
Use correct vue import.Roger Braun3+57-12
Merge branch 'feature/mark_conversations_with_a_red_line' into 'develop' Feature/mark conversations with a red line See merge request !25lambadalambda1+5-1
Add changeloglambadalambda1+35-0
Save notifications again.Roger Braun1+1-1
Compress saved state with zlib.Roger Braun3+13-2
Update package.json.Roger Braun2+4-19
Throttle saving data, once every 5 seconds is enough.Roger Braun1+6-1
Pull in persistence plugin, don't blow up on full storage.Roger Braun2+66-1
Merge branch 'feature/mutes' into developRoger Braun5+50-8
Merge branch 'equal-padding' into 'develop' set top and bottom padding on the bars to be equal because it was too top-heavy See merge request !24lambadalambda2+2-2
Merge branch 'feature/mobile_timeline_fills_full_width' into 'develop' Make timeline use full width on mobile See merge request !23lambadalambda1+8-0
Update README.mdlambadalambda1+2-1
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun1+50-0
Update vue.Roger Braun2+1220-1316
Remove state persistence for now.Roger Braun1+5-5
Only display 10 notifications at a time, 20 is too much.Roger Braun1+1-1
Add special case for mastodon user links.Roger Braun1+3-0
Open clicked links the statusnet_html in a new window.Roger Braun4+12-2
Merge branch 'clearnotifs' into developRoger Braun1+5-1
Fix button hover in Firefox.Roger Braun1+4-0
Revert "removed break-line for links because it didn't seem to make sense"Roger Braun1+1-1
Merge branch 'feature/ctrl-enter_posts_status' into 'develop' Ctrl-enter posts status See merge request !21lambadalambda1+2-2
Merge branch 'feature/top_bar_scrolls_to_top' into 'develop' Feature/top bar scrolls to top See merge request !19lambadalambda2+4-1
Reverse title and notification count.Roger Braun1+1-1
Don't cache node-modules.Roger Braun1+4-4
Merge branch 'link-wraparound-styling' into 'develop' (practicing the new branch thing) url styling See merge request !18lambadalambda2+2-0
Merge branch 'fix/prevent_follow_mute_button_deforming' into 'develop' Fix follow/mute buttons from getting squished on mobile See merge request !17lambadalambda1+3-2
Don't add notifications twice + persiste them.Roger Braun2+5-2
Make page title dynamic, better notification handling.Roger Braun4+38-7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun4+45-20
Add lodash transformation to save a few kbs.Roger Braun3+199-215
Use percentages for main view flex-basis.Roger Braun1+3-3
Update CONTRIBUTORS.mdlambadalambda1+5-3
Merge branch 'develop' into 'develop' Develop See merge request !15lambadalambda8+60-27
Show current theme in theme selector.Roger Braun1+6-4
One more fix.Roger Braun1+1-2
One more small visual fix to oembeds.Roger Braun1+1-0
Fix oembed attachments.Roger Braun3+7-4
Navbar fixes.Roger Braun1+2-0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun17+74-18
Add settings page to app.Roger Braun4+12-5
Add Settings page.Roger Braun2+31-0
Update font.Roger Braun12+33-19
Fetch Public and TWKN timelines when viewed.Roger Braun6+46-8
Update .gitlab-ci.ymllambadalambda1+1-1
Persist users.Roger Braun3+25-2
Add basic configuration module, make it work for title and theme.Roger Braun6+47-10
Make temporarily unmuted posts hideable again.Roger Braun1+11-3
Update font.Roger Braun13+82-29
Add muting to statuses.Roger Braun4+80-55
Add users muting.Roger Braun3+27-0
Add all_following endpoint.Roger Braun2+14-1
Prefer local image if available.Roger Braun1+1-1
Make status expandable into conversation.Roger Braun2+15-6
Use statusOrConversation component in timeline.Roger Braun2+4-2
Add statusOrConversation component.Roger Braun2+36-0
Extract conversation and create conversation page.Roger Braun5+39-12
Set color on status instead of on timeline.Roger Braun5+5-5
Break after user name in notifications.Roger Braun1+3-3
Fix file uploads in Chrome.Roger Braun1+14-3
Fix style setting in Chrome.Roger Braun1+2-0
Update README.mdlambadalambda1+4-0
Basic mobile panel switcher.Roger Braun3+45-7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun1+27-0
Align style switcher.Roger Braun1+7-1
Fix avatar size.Roger Braun1+0-4
Set the viewport for mobile devices.Roger Braun1+1-0
Add styleSwitcher.Roger Braun70+2119-42
User card background css fix.Roger Braun1+1-1
Dynamic style setting.Roger Braun4+49-6
Add some half-transparent border under main content.Roger Braun1+3-0
User profile css fix.Roger Braun1+1-1
Border css fix.Roger Braun1+1-1
Use solarized-light by default.Roger Braun3+39-1
Add styling with base16.Roger Braun18+83-70
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun5+84-1
Make minVisibleId actually dependent on visible statuses.Roger Braun2+9-6
Merge branch 'fix/refactoring_status_delete' into 'develop' Move delete button for status into a component See merge request !8lambadalambda4+41-21
Merge branch 'artifacts' into 'develop' add artifacts See merge request !9lambadalambda1+3-0
Check all statuses in timeline for old retweets.Roger Braun1+1-1
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun5+57-18
Remove wrong rights check.Roger Braun1+1-1
Merge branch 'feature/delete_status' into 'develop' Implements feature status delete Fixes issue #4 See merge request !6lambadalambda6+48-2
Merge branch 'fix/retweet_icon_style' into 'develop' Fixes issue #2 See merge request !7lambadalambda1+1-1
Rename nsfw image.Roger Braun3+1-1
CSS fixes.Roger Braun4+13-20
Add re-hiding of nsfw images.Roger Braun2+25-9
Fix long word breaking in notifications.Roger Braun1+2-0
Reactivity fixes for attachments.Roger Braun1+5-0
Add link to replied to users in status.Roger Braun1+3-1
Add basic user profiles.Roger Braun5+38-2
Extract user card from user content.Roger Braun3+49-34
Add friend list fetching.Roger Braun3+24-5
Get mentioning names from central state store.Roger Braun1+4-2
Add users repository in users module.Roger Braun2+61-14
Remove coverage from tests for now.Roger Braun1+18-18
Search through both name and screen_name.Roger Braun1+1-1
Add basic username completion.Roger Braun5+93-2
Add noIdUpdate option for addNewStatuses action.Roger Braun3+25-7
Remove Angular vestiges.Roger Braun2+1-16
Fix specs.Roger Braun1+0-9
Throw out retweets from conversations.Roger Braun1+8-1
Switch from moment.js to vue-timeago.Roger Braun8+17-29
Always show action buttons below user content.Roger Braun1+26-20
Move specs around.Roger Braun1+34-34
Add some cheap transition anymation.Roger Braun2+10-1
Fetch conversation again on route change.Roger Braun1+3-0
The heading is already bold.Roger Braun1+1-1
Add some icons to notifications.Roger Braun2+13-3
Add basic notification support.Roger Braun5+85-3
Add notification on mention.Roger Braun2+24-1
Add repeat notifications.Roger Braun2+21-0
Parse mastodon favorites.Roger Braun2+18-3
Open external status links in new window.Roger Braun1+1-1
Basic mention support.Roger Braun8+64-4
Hide timeline if user isn't logged in.Roger Braun2+6-1
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun1+2-0
remove apiService from users moduleRoger Braun2+3-3
Move some interactions to the backendInteractorRoger Braun6+50-9
Merge branch 'feature/attachment-form-improvements' into 'develop' Fix bugs related to uploading attachments See merge request !5lambadalambda19+156-91
Greentext.Roger Braun1+4-0
Show link to status source url.Roger Braun1+7-0
Re-indent style.Roger Braun1+24-24
Better handling of favorites.Roger Braun2+45-4
Fix word wrapping on Firefox.Roger Braun2+26-26
Image CSS fix for Firefox.Roger Braun1+0-1
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun2+10-0
Timeline status adding fixes.Roger Braun1+2-1
Remember positions on scroll.Roger Braun1+4-1
Add link to conversation in status.Roger Braun1+5-1
Add status / conversation component.Roger Braun3+63-1
Add status and conversation fetching to apiService.Roger Braun1+16-6
Make timelineless status adding possible.Roger Braun2+33-11
Remove example component.Roger Braun4+0-52
Add licenselambadalambda1+661-0
Re-add Contributors file.Roger Braun1+5-0
Prepare apiService for base url.Roger Braun1+6-0
Add image height css back in.Roger Braun1+1-0
Remove commented out old api service.Roger Braun1+0-68
ci.Roger Braun1+1-1
ci.Roger Braun1+20-0
Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-feRoger Braun2+10-6
Move addNewStatuses code around.Roger Braun1+82-80
Small status reducer changes.Roger Braun1+14-15
addNewStatuses: mutation -> actionRoger Braun2+2-87
Add first notification.Roger Braun2+37-3
Add status deletion.Roger Braun2+47-6
Merge branch 'status_reducer_rewrite'Roger Braun5+217-90
Small css fix, don't parse html for now.Roger Braun2+1-2
Merge branch 'feature/image-upload-improvements' into 'master' Feature/image upload improvements See merge request !2lambadalambda16+72-20
Merge branch 'feature/retweet' into 'master' Feature/retweet See merge request !1lambadalambda9+91-16
Don't break status parsing when link class is missing.Roger Braun2+7-1
Fix compilation error.Roger Braun1+1-1
Remove attachment links, as we are already showing them.Roger Braun5+42-6
Login form, post status form, status css fixes.Roger Braun3+8-5
CSS fixes for attachments in status posts.Roger Braun2+30-21
Some CSS fixes.Roger Braun3+8-2
Don't put statuses we received from retweets into timelines.Roger Braun2+17-16
Simplify nsfw setting.Roger Braun1+2-8
Better retweet handling.Roger Braun2+43-4
Add specs for statuses module.Roger Braun1+78-0
Don't do coverage (errord).Roger Braun1+1-1
Restructure status module for easier testing.Roger Braun1+35-33
Remove example spec.Roger Braun1+12-12
Unify App.vue.Roger Braun2+16-15
Add user links.Roger Braun1+3-3
Force recreation of img node.Roger Braun1+1-1
Attachment styling fixes.Roger Braun1+1-1
Linting fixes.Roger Braun5+13-14
Fix poststatusform attachment markup.Roger Braun1+9-0
Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-feRoger Braun36+273-81
Attachment CSS fixes.Roger Braun2+58-66
Hide after posting.Roger Braun2+3-2
CSS fixes...Roger Braun1+3-27
Make mention strings work.Roger Braun2+31-3
Add replies.Roger Braun3+25-8
Track status lists by id.Roger Braun1+1-1
Attachment styling fixes.Roger Braun1+34-0
Add background image.Roger Braun2+5-1
CSS fixes.Roger Braun2+16-1
Basic status posting.Roger Braun6+117-22
Add favorite-button.Roger Braun7+85-11
Remove skeleton logo.Roger Braun1+0-0
Add image font.Roger Braun16+690-0
Go to friends timeline on login.Roger Braun2+4-2
Fix up nsfw and some styling.Roger Braun6+73-20
Basic attachments, some retweet fixes.Roger Braun6+76-13
Update timestamps after fetch.Roger Braun2+14-3
New status showing.Roger Braun5+23-4
Basic statuses.Roger Braun8+92-6
Start fetching.Roger Braun3+118-53
Fix user panel bg image.Roger Braun1+2-2
Use users module.Roger Braun1+10-2
Update modules.Roger Braun3+153-100
Don't autoopen browser.Roger Braun1+1-1
Add LoginForm.Roger Braun2+40-0
Add UserPanel.Roger Braun2+57-0
Remove hello component from app.Roger Braun1+2-2
Add proxied routes.Roger Braun1+12-1
.Roger Braun19+2606-95
Basic skeletonRoger Braun38+6754-0