aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* i18n/Update pedantic JapaneseHakaba Hitoyo2019-08-17
|
* Merge branch 'telugu-translation' into 'develop'Shpuld Shpludson2019-08-17
|\ | | | | | | | | i18n: Translated to Telugu (44.3%) See merge request pleroma/pleroma-fe!913
| * i18n: Translated to Telugu (44.3%)Joseph Nuthalpati2019-08-10
| | | | | | | | | | | | Verified that the translation strings work by running Pleroma-FE locally. Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
* | Merge branch '564' into 'develop'Shpuld Shpludson2019-08-17
|\ \ | | | | | | | | | | | | | | | | | | Restore scroll position for user profile when navigate back and forward Closes #636 and #564 See merge request pleroma/pleroma-fe!914
| * | sync profile tab state with location querytaehoon2019-08-15
| | |
| * | refactor TabSwitchertaehoon2019-08-15
| | |
| * | use better name of controlled proptaehoon2019-08-15
| | |
| * | fix potential bug to render active tab in controlled waytaehoon2019-08-15
| | |
| * | remove unused paramtaehoon2019-08-15
| | |
| * | use key prop instead of dataset to identify active tabtaehoon2019-08-15
| | |
| * | remove useless index param of onSwitchtaehoon2019-08-15
| | |
| * | reset error state when load new profiletaehoon2019-08-15
| | |
| * | clear timelines only if load user not viewed previouslytaehoon2019-08-15
|/ /
* | Merge branch 'fix/fix-link-to-external-users-in-who-to-follow-page' into ↵HJ2019-08-15
|\ \ | | | | | | | | | | | | | | | | | | 'develop' Fix/Fix links to external users in Who to follow page See merge request pleroma/pleroma-fe!918
| * | Fix/Fix links to external users in Who to follow pageHakaba Hitoyo2019-08-15
|/ /
* | Merge branch '293' into 'develop'Shpuld Shpludson2019-08-14
|\ \ | | | | | | | | | | | | | | | | | | Detect hashtag using rel instead of class Closes #293 See merge request pleroma/pleroma-fe!908
| * | rel also accepts list, update rel detection logictaehoon2019-08-13
| | |
| * | use hashtag class detection as fallbacktaehoon2019-08-12
| | |
| * | detect hashtag using rel instead of classtaehoon2019-08-12
| | |
* | | Merge branch 'fix-chrome-logo' into 'develop'Shpuld Shpludson2019-08-14
|\ \ \ | |/ / |/| | | | | | | | Fix logo being all kinds of fucked on chrome by recovering autoprefixer See merge request pleroma/pleroma-fe!917
| * | revives autoprefixer which went AWOL during Webpack v1 -> v4 migrationHenry Jameson2019-08-14
|/ /
* | Merge branch '638' into 'develop'Shpuld Shpludson2019-08-12
|\ \ | | | | | | | | | | | | | | | | | | Fix inconsistent space bug between panels Closes #638 See merge request pleroma/pleroma-fe!916
| * | hide ISP if the panel content is emptytaehoon2019-08-12
|/ /
* | Merge branch '637' into 'develop'HJ2019-08-12
|\ \ | | | | | | | | | | | | | | | | | | Fix user card overflow bug Closes #637 See merge request pleroma/pleroma-fe!915
| * | fix user card overflow bugtaehoon2019-08-12
|/ /
* / fix js error on muteshpuld2019-08-10
|/
* Merge branch 'fix/incorrect-follow-request-status' into 'develop'HJ2019-08-09
|\ | | | | | | | | Fix sent follow request detection See merge request pleroma/pleroma-fe!910
| * Apply suggestion to src/services/follow_manipulate/follow_manipulate.jsrinpatch2019-08-09
| |
| * Apply suggestion to src/services/follow_manipulate/follow_manipulate.jsrinpatch2019-08-09
| |
| * Apply suggestion to src/services/follow_manipulate/follow_manipulate.jsrinpatch2019-08-09
| |
| * Fix sent follow request detectionrinpatch2019-08-09
| | | | | | | | | | | | | | This fixes `requestFollow` using the relationship instead of user object, resulting in `sent` always being false for locked users, and also removes assumptions about follow request being sent, instead relying on `requested` from user relationship.
* | Merge branch 'fix/text-dont-media-viewer' into 'develop'HJ2019-08-09
|\ \ | | | | | | | | | | | | fix english settings label regarding how to view videos See merge request pleroma/pleroma-fe!909
| * | fix english settings label regarding how to view videosmatrixsasuke2019-08-09
| | |
* | | fix extra buttons merge bugshpuld2019-08-08
| |/ |/|
* | Merge branch '632' into 'develop'Shpuld Shpludson2019-08-08
|\ \ | | | | | | | | | | | | | | | | | | Fix gif image zoom bug on hover Closes #632 See merge request pleroma/pleroma-fe!905
| * | make size of gif image and preview equaltaehoon2019-08-06
| |/
* | Merge branch '631' into 'develop'Shpuld Shpludson2019-08-08
|\ \ | | | | | | | | | | | | | | | | | | Hide image block in rich media preview in case of broken image Closes #631 See merge request pleroma/pleroma-fe!902
| * | hide rich media preview image in case of broken imagetaehoon2019-08-06
| |/
* | Merge branch '627' into 'develop'Shpuld Shpludson2019-08-08
|\ \ | | | | | | | | | | | | | | | | | | Fix "Post status modal disappearing on mobile landscape mode" Closes #627 See merge request pleroma/pleroma-fe!899
| * | css improvementstaehoon2019-08-06
| | |
| * | do not unmount post status modal in desktoptaehoon2019-08-06
| |/
* | Merge branch 'feat/conversation-muting' into 'develop'Shpuld Shpludson2019-08-08
|\ \ | |/ |/| | | | | Add Conversation/Thread Muting See merge request pleroma/pleroma-fe!876
| * Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-26
| |\ | | | | | | | | | | | | # Conflicts: # src/components/extra_buttons/extra_buttons.js # src/components/extra_buttons/extra_buttons.vue
| * \ Merge branch 'develop' into 'feat/conversation-muting'Shpuld Shpludson2019-07-15
| |\ \ | | | | | | | | | | | | # Conflicts: # src/services/api/api.service.js
| * | | Add thread muting to context menu of statusshpuld2019-07-07
| | | |
* | | | Merge branch 'issue-617' into 'develop'HJ2019-08-06
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle JSONified errors while registering Closes #617 See merge request pleroma/pleroma-fe!888
| * | | | Handle JSONified errors while registeringLee Starnes2019-08-06
|/ / / / | | | | | | | | | | | | Closes #617
* | | | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-07-31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update es.json (add sticker) See merge request pleroma/pleroma-fe!893
| * | | | Update es.json (add sticker)tarteka2019-07-24
| | |_|/ | |/| |
* | | | Merge branch '618' into 'develop'Shpuld Shpludson2019-07-31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to enlarge profile picture in profile page Closes #618 See merge request pleroma/pleroma-fe!890