Commit Graph

2695 Commits

Author SHA1 Message Date
Your New SJW Waifu 1d28afbaf6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-10-12 09:22:31 -05:00
Shpuld Shpludson d86cd3e850 Merge branch 'feat/masto-ws-deletes' into 'develop'
Support for WS deletes

See merge request pleroma/pleroma-fe!1227
2020-10-12 06:05:21 +00:00
Dym Sohin e5bd1c20b0 fix/leftover-emoji-checkboxes-in-settings 2020-10-11 02:03:45 +02:00
Shpuld Shpludson 069a4b0801 Merge branch 'fix/nsfw-hider-closing-preview' into 'develop'
Stop click propagation when unhiding nsfw

See merge request pleroma/pleroma-fe!1245
2020-10-09 16:15:30 +00:00
Shpuld Shpludson e7a67e33ad Merge branch 'fix/follow-requests-title' into 'develop'
Fix Follow Requests title style

See merge request pleroma/pleroma-fe!1243
2020-10-09 16:14:43 +00:00
feld 09da102a4c Apply 1 suggestion(s) to 1 file(s) 2020-10-06 16:18:30 +00:00
Your New SJW Waifu 671186c73c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-10-05 14:31:54 -05:00
Shpuld Shpuldson a0da6c31d9 Stop click propagation when unhiding nsfw 2020-10-02 12:21:56 +03:00
Mark Felder ff2fe5c68c Fix Follow Requests title style 2020-10-01 17:05:46 -05:00
Shpuld Shpludson 6bd38c7d6f Merge branch 'fix/wait-for-request-before-starting-interval' into 'develop'
Fix/wait for request before starting interval - fix #937

Closes #937

See merge request pleroma/pleroma-fe!1222
2020-10-01 13:20:14 +00:00
Shpuld Shpuldson 414558665f lint fix 2020-10-01 16:01:57 +03:00
Shpuld Shpludson 8a34ff2957 Merge branch 'develop' into 'feat/masto-ws-deletes'
# Conflicts:
#   CHANGELOG.md
#   src/components/status/status.js
#   src/components/status/status.scss
2020-10-01 12:54:54 +00:00
Shpuld Shpludson 68c2a5b18f Merge branch 'fix/excessive-underline-in-sidebar' into 'develop'
fix excessive underline in sidebar

See merge request pleroma/pleroma-fe!1238
2020-09-30 06:59:09 +00:00
Dym Sohin c17012cfe1 fix appended 0.65em on wrong line 2020-09-29 13:20:16 +02:00
Dym Sohin 1675f1a133 scoped back margin-right on icons 2020-09-29 13:13:42 +02:00
Shpuld Shpludson 91778a0276 Merge branch 'feat/custom-virtual-scrolling' into 'develop'
Timeline virtual scrolling

See merge request pleroma/pleroma-fe!1043
2020-09-29 10:18:37 +00:00
Shpuld Shpludson f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Shpuld Shpludson 3781e521e6 Merge branch 'feature/import_export_mutes' into 'develop'
[#2099] Added import/export mutes [FE]

See merge request pleroma/pleroma-fe!1229
2020-09-29 08:18:02 +00:00
Dym Sohin 3dacef944c remove bio-table's max-width 2020-09-24 12:05:51 +02:00
Dym Sohin f9977dbb3c fix excessive underline in sidebar 2020-09-19 21:28:03 +02:00
Maksim Pechnikov 3dbc1bedbf Merge branch 'develop' into feature/import_export_mutes 2020-09-18 22:04:01 +03:00
Your New SJW Waifu 6d9179c778 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-18 10:24:49 -05:00
Dym Sohin 70a5619496 [fix] case in/sensitive emoji search 2020-09-18 11:07:38 +02:00
Your New SJW Waifu 08d6fee1e7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-17 16:31:48 -05:00
Shpuld Shpuldson 20d33c2fbc change icon to a megaphone 2020-09-16 11:53:54 +03:00
Shpuld Shpuldson 1b811d8b93 change side drawer to use shoutbox name 2020-09-16 11:29:10 +03:00
eugenijm 8c4514013d Fix chat messages being missed when the streaming is disabled and the messages are sent by both participants simultaneously 2020-09-16 09:21:24 +03:00
Your New SJW Waifu 88aae13d08 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-12 15:35:14 -05:00
Shpuld Shpuldson afb2241a5b change a eslint disable to nextline only 2020-09-08 16:29:10 +03:00
Shpuld Shpuldson 8975589bca fix vue warnings and errors 2020-09-08 10:44:08 +03:00
Maksim Pechnikov 947d7cd6f2 added import/export mutes 2020-09-08 09:41:42 +03:00
Shpuld Shpuldson fa91766519 rename to gravestone 2020-09-08 09:32:43 +03:00
Shpuld Shpludson 1ec9cde963 Apply 1 suggestion(s) to 1 file(s) 2020-09-08 06:31:02 +00:00
Your New SJW Waifu bf1ccfc6fe Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-07 10:47:18 -05:00
Shpuld Shpuldson f9ac23b9a9 separate reply button to its own component, add changelog entry 2020-09-07 10:35:49 +03:00
Shpuld Shpuldson 40ca0b394e add basic deletes support that works with masto WS 2020-09-06 15:28:09 +03:00
Shpuld Shpludson e331db79e5 Merge branch 'develop' into 'fix/wait-for-request-before-starting-interval'
# Conflicts:
#   CHANGELOG.md
2020-09-04 08:38:13 +00:00
Shpuld Shpuldson 3fb35e8123 rename to promiseInterval 2020-09-04 11:19:53 +03:00
Shpuld Shpludson a73b09c732 Merge branch 'fix/locked-account-link-fix' into 'develop'
Open profile tab from 'locked' link in FO-post warning - Fix #945

Closes #945

See merge request pleroma/pleroma-fe!1223
2020-09-04 08:11:31 +00:00
Your New SJW Waifu 5aee3b2bd1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-03 20:39:15 -05:00
Shpuld Shpuldson f281663b49 Add hacky functionality to open specific settings tabs 2020-09-03 15:45:13 +03:00
Shpuld Shpuldson 1b6eee0497 change chats to use custom makeFetcher 2020-09-02 21:01:31 +03:00
Mark Felder 5809f33c86 Password reset no longer informs user of errors or account existence 2020-09-01 16:48:51 -05:00
Your New SJW Waifu d029dfb524 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-08-31 22:00:49 -05:00
Shpuld Shpuldson b5d15eddcf hide poll when subject collapsed, but show poll icon 2020-08-31 11:50:26 +03:00
Your New SJW Waifu cc34ad280f Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-08-27 21:42:24 -05:00
Shpuld Shpuldson c9ea2db69d fix long poll labels overflowing 2020-08-25 12:17:42 +03:00
Shpuld Shpuldson f0ac40a428 change more animated gif avatars to work properly 2020-08-25 11:40:02 +03:00
Shpuld Shpuldson 06159101cf fix avatar overwrite classes in usercard 2020-08-25 11:33:38 +03:00
Your New SJW Waifu ae318f099c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-08-20 17:13:20 -05:00