aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix parse for move type notificationskPherox2019-12-11
|
* Merge branch 'fix/remove-status-hack' into 'develop'HJ2019-12-08
|\ | | | | | | | | Remove whitespace hack on empty post content See merge request pleroma/pleroma-fe!1023
| * Remove whitespace hack on empty post contentrinpatch2019-12-08
|/ | | | | | It's no longer necessary since the backend handles posts with empty content fine and also fixes an odd whitespace when attachment links are disabled.
* Merge branch 'fix-font-load-for-pleroma-be' into 'develop'HJ2019-12-05
|\ | | | | | | | | | | | | Change output directory of fontello Closes pleroma-support#14 See merge request pleroma/pleroma-fe!1021
| * Change output directory of fontellokPherox2019-12-05
|/
* Merge branch '701' into 'develop'HJ2019-12-03
|\ | | | | | | | | | | | | Versioning the font resources using webpack Closes #701 See merge request pleroma/pleroma-fe!1017
| * add html-webpack-plugin to karma configtaehoon2019-12-03
| |
| * use another fork of fontello-webpack-plugintaehoon2019-12-03
| |
| * add animate-spin classtaehoon2019-12-03
| |
| * remove needless codetaehoon2019-12-03
| |
| * use another approach for versioning font filestaehoon2019-12-03
| |
| * versioning the font resources through webpacktaehoon2019-12-02
|/
* 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
|/