aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix/mrf-js-errors' into 'develop'Shpuld Shpludson2019-12-02
|\ | | | | | | | | fix "can't find property of undefined" errors in mrf transparency panel See merge request pleroma/pleroma-fe!1008
| * fix "can't find property of undefined" errors in mrf transparency panelShpuld Shpludson2019-12-02
|/
* Merge branch '719' into 'develop'Shpuld Shpludson2019-12-02
|\ | | | | | | | | | | | | Fix "Muted users not being collapsed on other user's profiles" Closes #719 See merge request pleroma/pleroma-fe!1013
| * restore muted users collapsing logic on other user’s profilestaehoon2019-11-25
| |
* | Merge branch '712' into 'develop'Shpuld Shpludson2019-12-02
|\ \ | |/ |/| | | | | | | | | Move mention button right next to mute button Closes #712 See merge request pleroma/pleroma-fe!1015
| * move mention button right next to mute buttontaehoon2019-11-26
|/
* Merge branch 'i18n/improve-easy-pedantic-japanese-switching-system' into ↵HJ2019-11-19
|\ | | | | | | | | | | | | 'develop' [i18n] Improve easy/pedantic Japanese switching See merge request pleroma/pleroma-fe!1003
| * [i18n] Improve easy/pedantic Japanese switchingHakaba Hitoyo2019-11-19
|/
* Merge branch 'greentext-strikes-back' into 'develop'HJ2019-11-19
|\ | | | | | | | | | | | | ⑨ Added greentext support ⑨ Closes #9 See merge request pleroma/pleroma-fe!994
| * use yarn, try to restart pipelineHenry Jameson2019-11-14
| |
| * tests + updatesHenry Jameson2019-11-14
| |
| * eslintHenry Jameson2019-11-14
| |
| * making dtluna proud or disgustedHenry Jameson2019-11-14
| |
| * Made it optionalHenry Jameson2019-11-14
| |
| * Fix regex, tag detector conditionHenry Jameson2019-11-14
| |
| * adds greentext, also small fixesHenry Jameson2019-11-14
| |
* | Merge branch 'iss-149/profile-fields-normalize' into 'develop'Shpuld Shpludson2019-11-19
|\ \ | | | | | | | | | | | | Normalize profile fields See merge request pleroma/pleroma-fe!995
| * | Normalize profile fieldskPherox2019-11-19
|/ /
* | Merge branch 'fix-fetch-follow-request-for-mobile' into 'develop'Shpuld Shpludson2019-11-19
|\ \ | | | | | | | | | | | | Fix follow request for mobile See merge request pleroma/pleroma-fe!1005
| * | backend interactor service: implement startFetchingFollowRequestkPherox2019-11-19
|/ / | | | | | | backend interactor service: remove unused fetchFollowRequests
* | Merge branch 'badge-checkbox' into 'develop'Shpuld Shpludson2019-11-16
|\ \ | | | | | | | | | | | | Show badge visibility user setting checkbox only if needed See merge request pleroma/pleroma-fe!999
| * | show badge visibility user setting checkbox only if neededtaehoon2019-11-16
|/ /
* | Merge branch 'feature/japanese-translation' into 'develop'Shpuld Shpludson2019-11-16
|\ \ | | | | | | | | | | | | Use kana+kanji as default for Japanese translation See merge request pleroma/pleroma-fe!1001
| * | Use kana+kanji as default for Japanese translationAkiraFukushima2019-11-17
|/ /
* | Merge branch 'chore/remove-outdated-changelog' into 'develop'rinpatch2019-11-15
|\ \ | | | | | | | | | | | | Remove outdated changelog file See merge request pleroma/pleroma-fe!1000
| * | Remove outdated changelog filerinpatch2019-11-15
|/ / | | | | | | This hasn't been updated in 2 years and we have CHANGELOG.md now.
* | Merge branch 'patch-1' into 'develop'rinpatch2019-11-15
|\ \ | | | | | | | | | | | | Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq) See merge request pleroma/pleroma-fe!998
| * | Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)Mew Mew2019-11-15
|/ /
* | Merge branch '695' into 'develop'rinpatch2019-11-14
|\ \ | | | | | | | | | | | | | | | | | | Close image modal by clicking image Closes #695 See merge request pleroma/pleroma-fe!996
| * | close image modal by clicking imagetaehoon2019-11-14
|/ /
* | Merge branch 'friend-follower-count-display' into 'develop'kaniini2019-11-13
|\ \ | |/ |/| | | | | Show "Hidden" instead of zero when followers/following counts are hidden See merge request pleroma/pleroma-fe!993
| * change N/A to Hiddentaehoon2019-11-12
| |
| * add a translationtaehoon2019-11-12
| |
| * show N/A when count is hiddentaehoon2019-11-12
|/
* Merge branch 'ocd-triggered' into 'develop'kaniini2019-11-11
|\ | | | | | | | | achieve the perfect speeeeen in media-upload See merge request pleroma/pleroma-fe!991
| * achieve the perfect speeeeen in media-uploadHenry Jameson2019-11-11
|/
* Merge branch '704' into 'develop'Shpuld Shpludson2019-11-10
|\ | | | | | | | | | | | | Fix "hideISP setting checkbox is broken" Closes #704 See merge request pleroma/pleroma-fe!990
| * add hideISP to defaultState of config moduletaehoon2019-11-10
|/
* Merge branch 'feature/about-page' into 'develop'kaniini2019-11-09
|\ | | | | | | | | | | | | Feature/about page Closes #699 See merge request pleroma/pleroma-fe!985
| * add changelog entryAriadne Conill2019-11-09
| |
| * mrf transparency panel: refactor to use vuex mapStateAriadne Conill2019-11-09
| |
| * mrf transparency panel: remove unneeded components{}Ariadne Conill2019-11-09
| |
| * boot: cleanup resolveStaffAccountsAriadne Conill2019-11-09
| |
| * lintAriadne Conill2019-11-09
| |
| * about: add MRF transparency panelAriadne Conill2019-11-09
| |
| * 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
|\ | | | | | | | | [Feature] Redirect remote user to internal ID See merge request pleroma/pleroma-fe!921
| * redirect /remote-users/:username@:hostname -> /users/:id, ↵Hakaba Hitoyo2019-11-08
|/ | | | /remote-users/:hostname/:username -> /users/:id