Commit Graph

3757 Commits (748e9c52034fdc5029c4afcaa5ce7aa5b7b27a5b)
 

Author SHA1 Message Date
rinpatch 748e9c5203 Merge branch 'chore/remove-outdated-changelog' into 'develop'
5 years ago
rinpatch a9022d0c32 Remove outdated changelog file
5 years ago
rinpatch 9a81a61759 Merge branch 'patch-1' into 'develop'
5 years ago
Mew Mew 3ecfbc8ea2 Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
5 years ago
rinpatch 0300502a96 Merge branch '695' into 'develop'
5 years ago
taehoon 90fc6b0774 close image modal by clicking image
5 years ago
kaniini 1f42283b8d Merge branch 'friend-follower-count-display' into 'develop'
5 years ago
taehoon 58839ecef8 change N/A to Hidden
5 years ago
taehoon 85685d6478 add a translation
5 years ago
taehoon 949f47063b show N/A when count is hidden
5 years ago
kaniini 3dae1cf396 Merge branch 'ocd-triggered' into 'develop'
5 years ago
Henry Jameson 9e774fffbf achieve the perfect speeeeen in media-upload
5 years ago
Shpuld Shpludson 7502ee9734 Merge branch '704' into 'develop'
5 years ago
taehoon 3c3f2c654e add hideISP to defaultState of config module
5 years ago
kaniini c873a18c64 Merge branch 'feature/about-page' into 'develop'
5 years ago
Ariadne Conill a2a94c4b7b add changelog entry
5 years ago
Ariadne Conill c24f95b498 mrf transparency panel: refactor to use vuex mapState
5 years ago
Ariadne Conill 6d6b5f3dbb mrf transparency panel: remove unneeded components{}
5 years ago
Ariadne Conill a4ae956a62 boot: cleanup resolveStaffAccounts
5 years ago
Ariadne Conill 6dfe3cc911 lint
5 years ago
Ariadne Conill 90f764224d about: add MRF transparency panel
5 years ago
Ariadne Conill 20ccd93a17 about: add staff panel
5 years ago
Ariadne Conill 5db77c839b about page: fix hiding of instance-specific panel, flow ToS and ISP better
5 years ago
Ariadne Conill 6cede475be nav panel: add link to about page
5 years ago
HJ 044c9ad056 Merge branch 'feature/redirect-external-user-to-id' into 'develop'
5 years ago
Hakaba Hitoyo e4820012a3 redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
5 years ago
HJ 2b68134ab0 Merge branch 'emoji-optimizations' into 'develop'
5 years ago
Henry Jameson a3501d58d8 clear filter on reopen, fix error message in console
5 years ago
Henry Jameson 23137dfd4b reset position when reopening emoji picker
5 years ago
Henry Jameson a69946923b eslint fix
5 years ago
Henry Jameson a43f1614ca fix not being able to see unicode emojis when there few of them when searching
5 years ago
Henry Jameson 9338c81f4a replace sanity button with loading on scroll
5 years ago
kaniini 5679dcdd18 Merge branch 'eslint-fix' into 'develop'
5 years ago
Henry Jameson a38d16273d fix search not working, use computer property instead of state
5 years ago
Henry Jameson 0dcb696e26 Merge remote-tracking branch 'upstream/develop' into emoji-optimizations
5 years ago
taehoon c1478b0887 fix eslint warnings
5 years ago
Shpuld Shpludson 632773ba91 Merge branch 'issue_381' into 'develop'
5 years ago
Wyatt Benno f66026bf20 Lightbox/modal multi image improvements - #381
5 years ago
kaniini df18ef30d0 Merge branch 'issue/209-2' into 'develop'
5 years ago
Maksim ded022a1d2 '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
5 years ago
kaniini e0a1b14eab Merge branch 'feature/change-email' into 'develop'
5 years ago
Sergey Suprunenko e3381cdef1 Add ability to change user's email
5 years ago
kaniini 326b2416a0 Merge branch 'develop' into 'develop'
5 years ago
kaniini b32a43fae5 Merge branch 'translations-de' into 'develop'
5 years ago
Matrix-Sasuke 18acc7af29 translations-de-batch-1
5 years ago
kaniini 092adf9831 Merge branch 'es-translate' into 'develop'
5 years ago
Tarteka 28524ab4a6 eu-translate update
5 years ago
Tarteka fe4845a7c1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
5 years ago
Tarteka a178346f1e Merge branch 'master' of https://git.pleroma.social/pleroma/pleroma-fe into develop
5 years ago
HJ 74f5f168d6 Merge branch 'develop' into 'develop'
5 years ago