Commit graph

4552 commits

Author SHA1 Message Date
Henry Jameson
ba07b01cda Merge branch 'settings-modal' into shigusegubu
* settings-modal: (23 commits)
  move helpers out of tabs directory
  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
  ...
2020-06-07 07:47:53 +03:00
Henry Jameson
68482fd3a6 move helpers out of tabs directory 2020-06-07 00:15:10 +03:00
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
7d695fc8f2 changelog 2020-06-06 23:22:58 +03:00
Henry Jameson
ebf2ce84fd alignment fixes 2020-06-06 23:08:52 +03:00
lain
0a3069aec0 Update CHANGELOG.md 2020-06-05 16:13:41 +00:00
Shpuld Shpludson
f6d5922e65 Merge branch '851-fix-squishy-images' into 'develop'
StillImage: Make it work properly in both firefox and chrome.

Closes #851

See merge request pleroma/pleroma-fe!1132
2020-06-05 16:06:19 +00: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
HJ
0bf2b372d0 Merge branch '790-unable-to-filter' into 'develop'
Settings: Keep a local version of the mutedWordsString

Closes #790

See merge request pleroma/pleroma-fe!1130
2020-06-05 12:03:46 +00: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
585bb5727a Merge branch '593-doc-change' into 'develop'
Docs: Change wrong documentation.

Closes #593

See merge request pleroma/pleroma-fe!1127
2020-06-04 16:07:13 +00: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
HJ
a6f73d7da5 Merge branch '788-hide-media-viewer-on-navigation' into 'develop'
MediaModal: Close on browser navigation events.

Closes #788

See merge request pleroma/pleroma-fe!1129
2020-06-04 16:00:53 +00:00
HJ
7f755878d5 Merge branch '802-emoji-alt' into 'develop'
EntityNormalizer: Add colons to emoji alt text.

Closes #802

See merge request pleroma/pleroma-fe!1126
2020-06-04 15:59:29 +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
lain
c0497b6f1f Docs: Change wrong documentation. 2020-06-04 15:34:29 +02:00
lain
05167f202f EntityNormalizerSpec: More fixes. 2020-06-04 15:31:52 +02:00
lain
c2dfe1f6cc EntityNormalizerSpec: Test new behavior. 2020-06-04 15:25:00 +02:00
lain
f197a2aa39 EntityNormalizer: Add colons to emoji alt text.
This makes it possible to copy them and still have them work.
2020-06-04 15:12:03 +02:00
lain
5ac2c365a7 Merge branch 'update-readme' into 'develop'
Update readme

See merge request pleroma/pleroma-fe!1123
2020-06-02 14:42:10 +00:00
Henry Jameson
de3a376beb fixed case in class name 2020-06-02 01:16:10 +03:00
Henry Jameson
63ba4b8f4f Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  track if settings modal has been opened once
2020-06-02 01:11:36 +03:00
Henry Jameson
4fae2f8ea8 track if settings modal has been opened once 2020-06-02 01:10:52 +03:00
Henry Jameson
0b288bf96f Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fixed tab not hiding
2020-05-29 13:39:42 +03:00
Henry Jameson
94436c1f85 fixed tab not hiding 2020-05-29 13:39:30 +03:00
Henry Jameson
0d44cf01b4 Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fixed the remaining issues
2020-05-29 13:18:19 +03:00
Henry Jameson
9a20a90932 fixed the remaining issues 2020-05-28 21:28:01 +03:00
Henry Jameson
fed9ddd397 fixed the remaining issues 2020-05-28 21:26:33 +03:00
HJ
f288178b67 Merge branch 'fix/sidebarRight_option' into 'develop'
The sidebarRight option wasn't being read

Closes #858

See merge request pleroma/pleroma-fe!1125
2020-05-28 17:36:05 +00:00
Mark Felder
5f41ee8864 The sidebarRight option wasn't being read 2020-05-28 12:28:32 -05:00
Francis Dinh
3111fc5dbc Use consistent naming for Pleroma-FE in README 2020-05-28 05:14:11 -04:00
Francis Dinh
6ecd1dd15b Remove mention of GNU Social
Pleroma-FE has not supported GNU Social for a while now. Plus the
wiki page for setting it up has been deleted.
2020-05-28 05:14:01 -04:00
Henry Jameson
db2d3d9c8c Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fixes. sorry for bad commit message i'm tired
  lint
  Move modal frame parts away from modal-content into modal, improve error handling
  moved multiChoiceProperties where it fits better
2020-05-27 12:39:13 +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
83e5ee5494 fix non-mention notifs 2020-05-26 00:22:15 +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
2dc01c6549 Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  oops
2020-05-25 19:57:42 +03:00
Henry Jameson
a14635f4f2 oops 2020-05-25 19:57:32 +03:00
Henry Jameson
64e4fdaeaa Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fix for a previous fix
  improve big spinner visibility
  Change flex for tab switcher lines to always have some small space reserved
  increase gap between buttons in titlebars
  fix icon changing color
  fix sidebar not closing in mobile
  lint
  lint
2020-05-25 17:24:42 +03:00
Henry Jameson
dc8f78e84d fix for a previous fix 2020-05-25 17:22:57 +03:00