Commit graph

2359 commits

Author SHA1 Message Date
Henry Jameson 9e3e6b0c69 Merge remote-tracking branch 'origin/develop' into settings-modal
* origin/develop: (22 commits)
  changelog
  alignment fixes
  Update CHANGELOG.md
  StillImage: Make it work properly in both firefox and chrome.
  ReactButton: Change the combined emoji (heart) to a simple one.
  Linting fixes.
  Settings: Keep a local version of the mutedWordsString
  MediaModal: Close on browser navigation events.
  StatusContent: Try to get hashtag from dataset first.
  Docs: Change wrong documentation.
  EntityNormalizerSpec: More fixes.
  EntityNormalizerSpec: Test new behavior.
  EntityNormalizer: Add colons to emoji alt text.
  fixed case in class name
  The sidebarRight option wasn't being read
  Use consistent naming for Pleroma-FE in README
  Remove mention of GNU Social
  lint
  multiple fixes
  fix non-mention notifs
  ...
2020-06-07 00:10:21 +03:00
HJ e47d0f2103 Merge branch 'fix-reprooted-muted-posts' into 'develop'
Fixed some issues with muting

See merge request pleroma/pleroma-fe!1120
2020-06-06 20:31:43 +00:00
Henry Jameson ebf2ce84fd alignment fixes 2020-06-06 23:08:52 +03:00
lain 2aabd8ed1a StillImage: Make it work properly in both firefox and chrome. 2020-06-05 17:55:19 +02:00
Shpuld Shpludson 63f237d736 Merge branch '848-change-emoji-reaction-defaults' into 'develop'
ReactButton: Change the combined emoji (heart) to a simple one.

Closes #848

See merge request pleroma/pleroma-fe!1131
2020-06-05 15:36:15 +00:00
lain ba4c189c53 ReactButton: Change the combined emoji (heart) to a simple one. 2020-06-05 17:26:13 +02:00
lain c4c5568b98 Linting fixes. 2020-06-05 13:51:47 +02:00
lain 282e10e3be Settings: Keep a local version of the mutedWordsString
Without this it was impossible to use newlines
2020-06-05 13:42:39 +02:00
HJ c678756eba Merge branch '748-hashtag-link-fixes' into 'develop'
StatusContent: Try to get hashtag from dataset first.

Closes #748

See merge request pleroma/pleroma-fe!1128
2020-06-04 16:06:33 +00:00
lain cb99dc2b27 MediaModal: Close on browser navigation events. 2020-06-04 16:30:28 +02:00
lain d872d55832 StatusContent: Try to get hashtag from dataset first. 2020-06-04 15:50:44 +02:00
Henry Jameson de3a376beb fixed case in class name 2020-06-02 01:16:10 +03:00
Henry Jameson 4fae2f8ea8 track if settings modal has been opened once 2020-06-02 01:10:52 +03:00
Henry Jameson 94436c1f85 fixed tab not hiding 2020-05-29 13:39:30 +03:00
Henry Jameson 9a20a90932 fixed the remaining issues 2020-05-28 21:28:01 +03:00
Henry Jameson 5ffcddd3b9 fixes. sorry for bad commit message i'm tired 2020-05-27 03:32:57 +03:00
Henry Jameson 3938ccb8e7 lint 2020-05-27 00:02:36 +03:00
Henry Jameson a8e013bd65 Move modal frame parts away from modal-content into modal, improve error handling 2020-05-26 23:58:55 +03:00
Henry Jameson 5187b37aca moved multiChoiceProperties where it fits better 2020-05-26 22:50:37 +03:00
Henry Jameson 1f205b87ac lint 2020-05-26 01:06:34 +03:00
Henry Jameson 9d09e4090f multiple fixes 2020-05-26 01:01:25 +03:00
Henry Jameson b5c1d074f8 fix reprööted posts not being muted properly. fix muted posts making
desktop notifications
2020-05-25 23:38:31 +03:00
Henry Jameson a14635f4f2 oops 2020-05-25 19:57:32 +03:00
Henry Jameson dc8f78e84d fix for a previous fix 2020-05-25 17:22:57 +03:00
Henry Jameson 101f657d36 improve big spinner visibility 2020-05-25 17:21:05 +03:00
Henry Jameson ccdbba2348 Change flex for tab switcher lines to always have some small space reserved 2020-05-25 17:18:57 +03:00
Henry Jameson 0eea5c6b80 fix icon changing color 2020-05-25 17:11:30 +03:00
Henry Jameson 500511b415 fix sidebar not closing in mobile 2020-05-25 17:05:30 +03:00
Henry Jameson 534e1fef88 lint 2020-05-25 16:56:32 +03:00
Henry Jameson 5d1b539da2 lint 2020-05-25 16:48:23 +03:00
Henry Jameson 097216c49e remove timeout, was meant for testing 2020-05-25 16:32:32 +03:00
Henry Jameson bb418bf155 fix tests. user-profile didn't have tab-switcher compnent imported!! 2020-05-25 16:23:14 +03:00
Henry Jameson 0286e1024c fix cursor on desktop, add modal link on mobile 2020-05-25 16:16:30 +03:00
Henry Jameson 7951192cd9 Improve settings-modal async loading, update vue to 2.6.11 to be able
to use Vue.observable, to implmement resettable async component
2020-05-25 16:11:05 +03:00
Henry Jameson a6ca923a76 icons update 2020-05-25 16:10:43 +03:00
Henry Jameson 79c03984bc scroll to top when switching tabs 2020-05-25 14:16:03 +03:00
Henry Jameson 6a4ad1fe62 added "settings saved" notice back 2020-05-25 14:04:36 +03:00
Henry Jameson e7ba4255bb eslint --fix + small fix 2020-05-25 03:43:55 +03:00
Henry Jameson bcea2e4d12 cleanup 2020-05-25 03:30:14 +03:00
Henry Jameson 138ec85003 Merge remote-tracking branch 'origin/develop' into settings-modal
* origin/develop: (95 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  ...
2020-05-25 03:29:48 +03:00
Henry Jameson 1e606d2f26 split modal's content into another component, add lazy loading 2020-05-25 03:14:41 +03:00
Henry Jameson a872c53472 misc fixes 2020-05-24 02:29:09 +03:00
Henry Jameson ab74cd4972 Multiple fixes for CSS, added proper auth checking 2020-05-24 02:06:55 +03:00
Shpuld Shpludson 0b44a5b601 Merge branch 'fix/its-me-elements' into 'develop'
Show "it's you" label and hide follow btn for current user

Closes #839 and #827

See merge request pleroma/pleroma-fe!1111
2020-05-20 14:48:52 +00:00
Sergey Suprunenko db8dd1223c
Make a condition clear and unambiguous 2020-05-14 09:27:58 +02:00
Sergey Suprunenko e50857d0ff
Show "it's you" label and hide follow btn for current user 2020-05-14 09:25:07 +02:00
Shpuld Shpuldson 8e39971098 add with_relationships where necessary 2020-05-13 17:48:31 +03:00
Henry Jameson bcebec478e moved stuff from settings, cleaned up naming for tabs, added close and peek 2020-05-10 06:46:06 +03:00
Shpuld Shpludson 1186205583 Merge branch 'develop' into 'feat/relationship-refactor'
# Conflicts:
#   src/components/notification/notification.js
2020-05-08 08:35:30 +00:00
Shpuld Shpludson 921eedfd84 Merge branch 'feat/status-content-separation' into 'develop'
Refactor: Separate status content from status

See merge request pleroma/pleroma-fe!1092
2020-05-08 08:33:55 +00:00