aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | about: add staff panelAriadne Conill2019-11-08
| * | about page: fix hiding of instance-specific panel, flow ToS and ISP betterAriadne Conill2019-11-08
| * | nav panel: add link to about pageAriadne Conill2019-11-08
|/ /
* | Merge branch 'feature/redirect-external-user-to-id' into 'develop'HJ2019-11-08
|\ \
| * | redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:host...Hakaba Hitoyo2019-11-08
|/ /
* | Merge branch 'emoji-optimizations' into 'develop'HJ2019-11-08
|\ \
| * | clear filter on reopen, fix error message in consoleHenry Jameson2019-11-08
| * | reset position when reopening emoji pickerHenry Jameson2019-11-08
| * | eslint fixHenry Jameson2019-11-08
| * | fix not being able to see unicode emojis when there few of them when searchingHenry Jameson2019-11-08
| * | replace sanity button with loading on scrollHenry Jameson2019-11-08
| * | fix search not working, use computer property instead of stateHenry Jameson2019-11-08
| * | Merge remote-tracking branch 'upstream/develop' into emoji-optimizationsHenry Jameson2019-11-08
| |\ \
| * | | fix loadEmojiInsane button submitting the formHenry Jameson2019-10-27
| * | | fix scrolling to attachments bottomHenry Jameson2019-10-22
| * | | Reserve space for emoji picker button in emoji inputHenry Jameson2019-10-14
| * | | fix picker not filling on opening, removed console logHenry Jameson2019-10-10
| * | | moved emoji fetching from user to instance since it's its state anywayHenry Jameson2019-10-09
| * | | always preload first batch of emoji to avoid unnecessary UI jumpsHenry Jameson2019-10-09
| * | | eslintHenry Jameson2019-10-08
| * | | fixed emoji picker showing up beyond viewportHenry Jameson2019-10-08
| * | | start loading emoji when picker is openHenry Jameson2019-10-08
| * | | remove the "textbox grows the 'wrong' way" behavior, replace it with moreHenry Jameson2019-10-08
| * | | arbitrary limit with option to overcome itHenry Jameson2019-10-08
| * | | emoji picker gradual renderHenry Jameson2019-10-08
| * | | moved emoji stuff away from after-store and into users module since we only needHenry Jameson2019-10-08
* | | | Merge branch 'eslint-fix' into 'develop'kaniini2019-11-08
|\ \ \ \ | |_|/ / |/| | |
| * | | fix eslint warningstaehoon2019-11-08
|/ / /
* | | Merge branch 'issue_381' into 'develop'Shpuld Shpludson2019-11-08
|\ \ \
| * | | Lightbox/modal multi image improvements - #381Wyatt Benno2019-11-08
|/ / /
* | | Merge branch 'issue/209-2' into 'develop'kaniini2019-11-08
|\ \ \
| * | | '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'Maksim2019-11-08
|/ / /
* | | Merge branch 'feature/change-email' into 'develop'kaniini2019-11-08
|\ \ \
| * | | Add ability to change user's emailSergey Suprunenko2019-11-08
|/ / /
* | | Merge branch 'develop' into 'develop'kaniini2019-11-08
|\ \ \
| * | | Remove fonts section, make buttons change color on hover/pressmarcin mikołajczak2019-05-20
| * | | Make mammal theme look more like gargsite=2019-05-20
* | | | Merge branch 'translations-de' into 'develop'kaniini2019-11-08
|\ \ \ \
| * | | | translations-de-batch-1Matrix-Sasuke2019-11-08
|/ / / /
* | | | Merge branch 'es-translate' into 'develop'kaniini2019-11-08
|\ \ \ \
| * | | | eu-translate updateTarteka2019-10-30
| * | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ...Tarteka2019-10-30
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'develop' into 'develop'HJ2019-10-30
|\ \ \ \ \
| * | | | | profile-banner rounding css, fixes #690DYM2019-10-30
|/ / / / /
* | | | | Merge branch 'settings-refactor' into 'develop'HJ2019-10-29
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into settings-refactorHenry Jameson2019-10-29
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'eu-translate' into 'develop'Shpuld Shpludson2019-10-29
|\ \ \ \ \ \
| * | | | | | update and fixtarteka2019-10-07
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '599' into 'develop'Shpuld Shpludson2019-10-29
|\ \ \ \ \ \
| * | | | | | remove needless reftaehoon2019-10-24