Your New SJW Waifu
ebd893a3a2
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-07 18:02:58 -05:00
Shpuld Shpuldson
ddde05771f
update with bookmarks, clean up some code
2020-07-07 17:34:35 +03:00
Shpuld Shpuldson
e3991db5c4
fix conflicts and add error handling to media descriptions
2020-07-07 10:01:37 +03:00
Your New SJW Waifu
634847e6e4
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-06 06:58:49 -05:00
Shpuld Shpuldson
87b5f828d7
fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts
2020-07-06 14:01:03 +03:00
Shpuld Shpuldson
f254a847d2
move translation strings to correct place, translate error message
2020-07-06 10:53:03 +03:00
Shpuld Shpuldson
afdc3f96f0
fix conflicts, make subject update the preview
2020-07-06 10:45:47 +03:00
Your New SJW Waifu
cb193273d5
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-05 16:28:00 -05:00
Shpuld Shpludson
af4a26b588
Merge branch 'feat/allow-use-without-cookies' into 'develop'
...
Fix #815 : Allow use without cookies, Add a global notice popup system
Closes #815
See merge request pleroma/pleroma-fe!1166
2020-07-05 06:53:29 +00:00
Your New SJW Waifu
b2d941e249
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-04 18:17:20 -05:00
Eugenij
de291e2e33
Add bookmarks
...
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
ebe885953c
change more opinionated translation
2020-07-03 12:59:30 +03:00
Shpuld Shpuldson
21d1f557f6
change styles for the dropdown, make things work nicely on mobile
2020-07-03 12:56:31 +03:00
Shpuld Shpludson
c0fb35b106
Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'
...
# Conflicts:
# CHANGELOG.md
2020-07-02 04:50:03 +00:00
Your New SJW Waifu
df1cef6e99
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-07-01 14:06:04 -05:00
Shpuld Shpuldson
43b7a5d9b3
update the message and changelog
2020-07-01 19:22:39 +03:00
Shpuld Shpuldson
d30b0b28c9
catch localforage error and let the application work, add an alert for user to dismiss
2020-07-01 19:15:28 +03:00
Shpuld Shpuldson
38d8526660
change Show New text to Reload when flushing
2020-06-30 17:37:36 +03:00
Your New SJW Waifu
a5e9d280b0
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-06-29 15:14:28 -05:00
Shpuld Shpuldson
79011e02ef
Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring
2020-06-29 15:19:41 +03:00
lain
82944f862d
Merge branch '812-subject-separation' into 'develop'
...
StatusContent: Better separate subject from status content.
Closes #812
See merge request pleroma/pleroma-fe!1150
2020-06-29 07:53:12 +00:00
Shpuld Shpuldson
61f34ff361
remove panel-footer in userpanel, simplify preview header, fix word-wrap in preview
2020-06-28 16:40:39 +03:00
Shpuld Shpuldson
ed5b36f751
make line sizes match for errors/loading and statuses, make X hitbox bigger, remove attachments, add shorter custom message for empty status preview. fix auto update triggering
2020-06-28 15:43:08 +03:00
Shpuld Shpuldson
223fabfe90
add rich text preview
2020-06-28 12:16:41 +03:00
William Pitcock
2c6ec37e6a
media description support
2020-06-28 02:10:06 -04:00
Your New SJW Waifu
1469b27d82
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-06-27 16:48:07 -05:00
Shpuld Shpludson
ea0a12f604
Merge branch 'develop' into 'iss-149/profile-fields-setting'
...
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
2020-06-27 07:19:49 +00:00
Mark Felder
6606b57f44
Update english i18n
2020-06-26 16:59:22 -05:00
Mark Felder
caf9a2a8f6
Revert i18n to develop
2020-06-26 16:56:57 -05:00
Shpuld Shpuldson
8c3106c588
Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used
2020-06-26 18:20:32 +03:00
Mark Felder
199fc9351d
Merge branch 'develop' into refactor/notification_settings
2020-06-25 15:28:17 -05:00
Your New SJW Waifu
e50677913c
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-06-22 14:21:29 -05:00
Sergey Suprunenko
2451956d83
Add 'bot' flag to Profile settings
2020-06-21 14:59:05 +02:00
Your New SJW Waifu
ec393a2660
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-06-10 14:13:48 -05:00
kPherox
de9cc033df
Add i18n en
2020-06-10 03:48:41 +09:00
Your New SJW Waifu
916cefc15e
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-06-08 10:51:11 -05:00
Sergey Suprunenko
1007039478
Autocomplete domain mutes from list of known instances
2020-06-08 13:17:18 +02:00
HJ
acbef1ebdc
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Weblate pleroma pleroma fe
See merge request pleroma/pleroma-fe!1134
2020-06-07 15:21:05 +00:00
Henry Jameson
1e554ee287
indent 2
2020-06-07 18:19:34 +03:00
Your New SJW Waifu
3e4897576d
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-06-06 16:24:44 -05: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
Henry Jameson
ebf2ce84fd
alignment fixes
2020-06-06 23:08:52 +03:00
Ben Is
e1475d7f57
Translated using Weblate (English)
...
Currently translated at 100.0% (613 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-06-05 16:13:45 +00:00
Mark Felder
b8350423d9
Updated Notification Settings API use
2020-05-28 10:57:02 -05: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
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
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
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
Your New SJW Waifu
619a3fc7da
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-05-15 10:14:31 -05:00
Your New SJW Waifu
230aa86ba3
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-05-14 18:54:17 -05:00
rinpatch
ca52a7321d
Merge remote-tracking branch 'weblate/develop' into resolve-weblate-merge-conflicts
2020-05-14 22:53:08 +03:00
Anonymous
8db7cba9e1
Translated using Weblate (English)
...
Currently translated at 100.0% (613 of 613 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
2020-05-14 18:13:04 +00: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
Your New SJW Waifu
c4e091f969
Revert "Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard""
...
This reverts commit 07e9ce3d08
.
2020-05-08 20:01:59 -05:00
Your New SJW Waifu
07e9ce3d08
Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard"
...
This reverts commit 4250541faf
2020-05-09 00:58:11 +00:00
Your New SJW Waifu
4250541faf
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-05-08 17:38:09 -05:00
Mark Felder
9180fdb492
Clarify that we only delete data, not the account
2020-05-08 15:56:53 -05:00
Shpuld Shpludson
f4676e17d3
Merge branch 'develop' into 'feature/copy-link'
...
# Conflicts:
# static/fontello.json
2020-05-08 08:20:03 +00:00
Mark Felder
b3003d4e8d
Add notification privacy option to user settings
2020-05-06 11:46:40 -05:00
Henry Jameson
2e35289c33
initial work on settings modal
2020-05-03 17:36:12 +03:00
Your New SJW Waifu
0361a4b308
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-05-02 10:56:17 -05:00
eugenijm
01b07f01e9
Add support for follow request notifications
2020-04-30 09:58:55 +03:00
Your New SJW Waifu
8ed8a85e12
Epstein didn't kill himself
2020-04-17 05:41:29 -05:00
Mark Felder
8c5946b728
Add button in 3dot menu to copy status link to clipboard
2020-03-30 12:39:28 -05:00
Your New SJW Waifu
60b7ce00ac
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-03-02 07:30:50 -06:00
Shpuld Shpuldson
ab4005add5
add status unavailable message when status can't be loaded in status preview
2020-03-02 08:35:57 +02:00
Your New SJW Waifu
32358b8abd
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-02-20 19:59:08 -06:00
HJ
3ddf7ebe2c
Merge branch 'themes-accent' into 'develop'
...
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"
Closes #750 and #774
See merge request pleroma/pleroma-fe!1037
2020-02-18 21:20:43 +00:00
Your New SJW Waifu
d031267ef3
updates to neckbeard
2020-02-14 16:04:32 -06:00
Hakaba Hitoyo
4aeba026e6
Refactor i18n messages for MRF policy disclosure
2020-02-13 09:43:56 +00:00
Your New SJW Waifu
23d91b7806
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-02-12 17:01:26 -06:00
HJ
84ebae8ed3
Merge branch 'develop' into 'themes-accent'
...
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
Shpuld Shpludson
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
Your New SJW Waifu
6c38e9549f
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-02-11 02:46:55 -06:00
Shpuld Shpludson
17b6d8ddb8
Merge branch 'move-type-notification' into 'develop'
...
Add setting for allow following move
Closes #732
See merge request pleroma/pleroma-fe!1054
2020-02-10 14:51:35 +00:00
Hakaba Hitoyo
dafced3a86
MRF Keyword Policy Disclosure
2020-02-10 08:04:58 +00:00
Henry Jameson
611da13a4b
Better Disabled buttons support. Mammal theme fixes. Implemented proper
...
context-aware `mod` argument - now checks lightness of "variant" color. needs
retesting tho
2020-02-07 01:25:26 +02:00
kPherox
ce68ef0138
Add option text
2020-02-04 04:54:36 +09:00
Your New SJW Waifu
eb37b6d450
updates to neckbeard
2020-01-29 07:28:33 -06:00
Henry Jameson
f0c4bb1193
Merge remote-tracking branch 'upstream/develop' into themes-accent
...
* upstream/develop: (33 commits)
add emoji reactions to changelog
fix emoji reaction classes broken in develop
review changes
Fix password and email update
remove unnecessary anonymous function
Apply suggestion to src/services/api/api.service.js
remove logs/commented code
remove favs count from react button
remove mock data
change emoji reactions to use new format
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
Fix missing TWKN when logged in, but server is set to private mode.
Fix follower request fetching
Add domain mutes to changelog
Implement domain mutes v2
change changelog to reflect actual release history of frontend
Fix #750 , fix error messages and captcha resetting
Optimize Notifications Rendering
update CHANGELOG
Use last seen notif instead of first unseen notif for sinceId
...
2020-01-28 20:44:13 +02:00
Henry Jameson
b63e679a31
removed one color TODO
2020-01-28 02:03:21 +02:00
Shpuld Shpuldson
c4beac5f89
Merge branch 'develop' into feat/emoji-reactions
2020-01-26 15:59:59 +02:00
Henry Jameson
d98e31af45
snapshot/source mismatch case
2020-01-22 02:44:39 +02:00
Henry Jameson
644ce497a0
lightBg -> highlight because it causes issues with v2
2020-01-22 01:28:46 +02:00
Henry Jameson
803edcb53a
dismiss warning when loading theme
2020-01-22 01:28:17 +02:00
Henry Jameson
1191207aa5
more help strings
2020-01-22 00:53:51 +02:00
Henry Jameson
9336140486
massively improved initial theme loading code, added checks and warnings when
...
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
Henry Jameson
93dfb4d352
fix shadow picker preview, change hint
2020-01-20 02:00:13 +02:00
Your New SJW Waifu
a7129b0d0b
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-01-15 22:34:35 -06:00
Shpuld Shpludson
7a013ac393
Implement domain mutes v2
2020-01-15 20:22:54 +00:00
Shpuld Shpuldson
b32888194c
fix merge conflicts
2020-01-13 23:47:32 +02:00
Henry Jameson
c3cd66335f
i18n & fixes
2020-01-13 22:26:31 +02:00
Henry Jameson
8d2f2866f6
computed colors support
2020-01-13 01:56:29 +02:00
Henry Jameson
40ba3e2252
added more slots to UI
2020-01-12 23:41:11 +02:00
Henry Jameson
39dd08e694
replace hsl's l with relative luminance for better lightness detection
2020-01-12 17:58:26 +02:00
Your New SJW Waifu
027ecda6d8
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-01-11 19:01:38 -06:00
HJ
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
Your New SJW Waifu
36c041e9b7
Merge remote-tracking branch 'upstream/develop' into develop
2019-12-31 18:52:53 -06:00
Henry Jameson
e5a34870f0
Accent works
2019-12-28 15:55:42 +02:00
kPherox
b4acbf5311
Add user migrates filter to interactions
2019-12-11 18:30:26 +09:00