aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix user activation/deactivation, deletion, and role assignment in the ↵eugenijm2020-02-17
| | | | moderation menu
* Merge branch 'fix/no-mrf-transparency-crash' into 'develop'Shpuld Shpludson2020-02-17
|\ | | | | | | | | | | | | after_store: Fix failing to parse nodeinfo when mrf transparency is disabled Closes #772 See merge request pleroma/pleroma-fe!1064
| * after_store: Fix failing to parse nodeinfo when mrf transparency isrinpatch2020-02-13
| | | | | | | | | | | | disabled Closes #772
* | Merge branch 'fix-android-emoji-input' into 'develop'HJ2020-02-16
|\ \ | |/ |/| | | | | | | | | Add onInput() function as listener for input events, remove unnecessary compositionupdate listener Closes #775 See merge request pleroma/pleroma-fe!1065
| * EmojiInput tests should be checking the input value on the last input event, ↵xenofem2020-02-16
| | | | | | | | not the first
| * Add onInput() function as listener for input events, remove unnecessary ↵xenofem2020-02-16
| | | | | | | | compositionupdate listener
* | Merge branch 'refactor/i18n-messages-for-mrf-policy-disclosure' into 'develop'Shpuld Shpludson2020-02-13
|\ \ | | | | | | | | | | | | Refactor i18n messages for MRF policy disclosure See merge request pleroma/pleroma-fe!1062
| * | Refactor i18n messages for MRF policy disclosureHakaba Hitoyo2020-02-13
|/ /
* | Merge branch 'improve-default-tos' into 'develop'Shpuld Shpludson2020-02-13
|\ \ | | | | | | | | | | | | Improve default ToS See merge request pleroma/pleroma-fe!1057
| * | Improve default ToSHakaba Hitoyo2020-02-13
|/ /
* | Merge branch 'feat/emoji-reaction-fixes-improvements' into 'develop'lain2020-02-11
|\ \ | | | | | | | | | | | | Emoji Reactions - fixes and improvements See merge request pleroma/pleroma-fe!1051
| * | Emoji Reactions - fixes and improvementsShpuld Shpludson2020-02-11
|/ /
* | Merge branch 'move-type-notification' into 'develop'Shpuld Shpludson2020-02-10
|\ \ | | | | | | | | | | | | | | | | | | Add setting for allow following move Closes #732 See merge request pleroma/pleroma-fe!1054
| * | Add option textkPherox2020-02-04
| | |
| * | Add `with_move` param for fetching notificationkPherox2020-02-04
| | |
| * | Change to hide User migrates tab when allow following movekPherox2020-02-04
| | |
| * | Add setting for allow_following_movekPherox2020-02-04
| | |
* | | Merge branch 'feature-collapsed-media-indicator' into 'develop'Shpuld Shpludson2020-02-10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Indicate whether collapsed statuses contain gallery media or link preview cards Closes #767 See merge request pleroma/pleroma-fe!1056
| * | | Include non-gallery attachments and distinguish between images and videosxenofem2020-02-08
| | | |
| * | | Indicate whether collapsed statuses contain gallery media or link preview cardsxenofem2020-02-08
| | |/ | |/|
* | | Merge branch 'feature/mrf-keyword-policy-disclosure' into 'develop'Shpuld Shpludson2020-02-10
|\ \ \ | |/ / |/| | | | | | | | MRF Keyword Policy Disclosure See merge request pleroma/pleroma-fe!1055
| * | MRF Keyword Policy DisclosureHakaba Hitoyo2020-02-10
|/ /
* | Merge branch 'fix/escape-html' into 'develop'feld2020-02-06
|\ \ | |/ |/| | | | | | | | | Escape HTML from display name and subject fields Closes #724 See merge request pleroma/pleroma-fe!1052
| * Escape HTML from display name and subject fieldsrinpatch2020-01-30
| | | | | | | | Closes #724
* | Merge branch 'fix/one-click-nsfw-videos' into 'develop'HJ2020-01-31
|\ \ | |/ |/| | | | | Fix one click nsfw unhide on videos See merge request pleroma/pleroma-fe!1053
| * Fix one click nsfw unhide on videosShpuld Shpludson2020-01-31
|/
* add emoji reactions to changelogShpuld Shpuldson2020-01-28
|
* fix emoji reaction classes broken in developShpuld Shpuldson2020-01-28
|
* Merge branch 'feat/emoji-reactions' into 'develop'lain2020-01-28
|\ | | | | | | | | Emoji reactions See merge request pleroma/pleroma-fe!1049
| * review changesShpuld Shpuldson2020-01-28
| |
| * Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe ↵Shpuld Shpuldson2020-01-27
| |\ | | | | | | | | | into feat/emoji-reactions
| | * Apply suggestion to src/services/api/api.service.jslain2020-01-27
| | |
| * | remove unnecessary anonymous functionShpuld Shpuldson2020-01-27
| |/
| * remove logs/commented codeShpuld Shpuldson2020-01-27
| |
| * remove favs count from react buttonShpuld Shpuldson2020-01-26
| |
| * Merge branch 'develop' into feat/emoji-reactionsShpuld Shpuldson2020-01-26
| |\
| * | remove mock dataShpuld Shpuldson2020-01-26
| | |
| * | change emoji reactions to use new formatShpuld Shpuldson2020-01-26
| | |
| * | clean up code, fix prediction bugShpuld Shpuldson2020-01-14
| | |
| * | fix merge conflictsShpuld Shpuldson2020-01-13
| |\ \
| * | | usable-but-buggy: picker, adding/removing reaction on click, search, stylesShpuld Shpuldson2020-01-13
| | | |
| * | | wip commit, add basic popover for emoji reaction selectShpuld Shpuldson2019-11-15
| | | |
| * | | add fetching for emoji reactions, draft designShpuld Shpuldson2019-11-15
| | | |
* | | | Merge branch 'fix-password-and-email-update' into 'develop'HJ2020-01-28
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix email and password forms in user settings See merge request pleroma/pleroma-fe!1050
| * | | Fix password and email updateeugenijm2020-01-28
|/ / /
* | | Merge branch 'event-target-fix' into 'develop'HJ2020-01-24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Polyfills for EventTarget and CustomEvent Closes #756 See merge request pleroma/pleroma-fe!1048
| * | | Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed ↵eugenijm2020-01-24
|/ / / | | | | | | | | | for IE)
* | | Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'HJ2020-01-23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix missing TWKN when logged in, but server is set to private mode. Closes #759 See merge request pleroma/pleroma-fe!1047
| * | | Fix missing TWKN when logged in, but server is set to private mode.Mark Felder2020-01-23
|/ / /
* | | Merge branch 'fix-follow-requests' into 'develop'Shpuld Shpludson2020-01-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix follower request fetching Closes pleroma#1523 and #757 See merge request pleroma/pleroma-fe!1046