4aeba026e6
Refactor i18n messages for MRF policy disclosure
2020-02-13 09:43:56 +00:00
Shpuld Shpludson
f50068ef35
Merge branch 'improve-default-tos' into 'develop'
...
Improve default ToS
See merge request pleroma/pleroma-fe!1057
2020-02-13 09:41:31 +00:00
823a303f8a
Improve default ToS
2020-02-13 09:41:31 +00:00
Henry Jameson
ba3c278002
dismiss warning when selecting other themes, fix collapsed attachments link color
2020-02-12 01:26:01 +02:00
Henry Jameson
0fd78e99f5
properly clear theme
2020-02-12 01:19:48 +02:00
Henry Jameson
73dd7209dd
fixed transparent + semi-transparent inheritance case
2020-02-12 01:12:36 +02:00
Henry Jameson
2274976c09
post-merge fix
2020-02-12 01:10:00 +02: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
Henry Jameson
60446c56a5
fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy
...
themes to have derived colors instead of fixed ones.
2020-02-12 00:46:48 +02:00
lain
96dc297bab
Merge branch 'feat/emoji-reaction-fixes-improvements' into 'develop'
...
Emoji Reactions - fixes and improvements
See merge request pleroma/pleroma-fe!1051
2020-02-11 12:24:51 +00:00
Shpuld Shpludson
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
Henry Jameson
29133fb008
don't use cache for theme data
2020-02-11 10:42:15 +02:00
Henry Jameson
786a695eb6
Merge remote-tracking branch 'upstream/develop' into themes-accent
...
* upstream/develop:
Fix one click nsfw unhide on videos
Escape HTML from display name and subject fields
2020-02-11 10:03:34 +02:00
Henry Jameson
6f3ac707f7
fix and update changelog
2020-02-11 09:59:26 +02:00
Henry Jameson
43bddc79e0
fix/remove contrast ratios
2020-02-11 01:13:59 +02:00
Henry Jameson
e6f148b8a3
removed base16-related code
2020-02-11 00:59:07 +02:00
Henry Jameson
b4278ee517
fix warning stylings
2020-02-11 00:52:25 +02:00
Henry Jameson
38c34b8b51
fixed eslint, made mod work properly depending on context including in shadows
2020-02-11 00:34:30 +02: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
Shpuld Shpludson
6be6241767
Merge branch 'feature-collapsed-media-indicator' into 'develop'
...
Indicate whether collapsed statuses contain gallery media or link preview cards
Closes #767
See merge request pleroma/pleroma-fe!1056
2020-02-10 14:50:42 +00:00
xenofem
02864bc07b
Prioritize custom emoji a lot and boost exact matches to the top
2020-02-10 09:32:07 -05:00
Shpuld Shpludson
788ff531d6
Merge branch 'feature/mrf-keyword-policy-disclosure' into 'develop'
...
MRF Keyword Policy Disclosure
See merge request pleroma/pleroma-fe!1055
2020-02-10 08:04:58 +00:00
dafced3a86
MRF Keyword Policy Disclosure
2020-02-10 08:04:58 +00:00
xenofem
44dea9f364
Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting
2020-02-09 17:39:07 -05:00
xenofem
e36c39be19
Include non-gallery attachments and distinguish between images and videos
2020-02-08 16:01:01 -05:00
xenofem
36e19128bf
Indicate whether collapsed statuses contain gallery media or link preview cards
2020-02-08 13:15:09 -05: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
8fcb9c42aa
Merge branch 'fix/escape-html' into 'develop'
...
Escape HTML from display name and subject fields
Closes #724
See merge request pleroma/pleroma-fe!1052
2020-02-06 16:12:11 +00:00
kPherox
ce68ef0138
Add option text
2020-02-04 04:54:36 +09:00
kPherox
a06f3a7fbc
Add with_move param for fetching notification
2020-02-04 04:54:36 +09:00
kPherox
9b7497a659
Change to hide User migrates tab when allow following move
2020-02-04 04:54:36 +09:00
kPherox
9bbf10b55d
Add setting for allow_following_move
2020-02-04 04:54:28 +09:00
HJ
e73e235b4d
Merge branch 'fix/one-click-nsfw-videos' into 'develop'
...
Fix one click nsfw unhide on videos
See merge request pleroma/pleroma-fe!1053
2020-01-31 00:24:54 +00:00
Shpuld Shpludson
4a266a4d05
Fix one click nsfw unhide on videos
2020-01-31 00:24:54 +00:00
rinpatch
746416207b
Escape HTML from display name and subject fields
...
Closes #724
2020-01-30 19:58:23 +03:00
Henry Jameson
e46bb94226
updated preview to account for underlay
2020-01-28 23:45:14 +02:00
Henry Jameson
8462853269
update button toggled state, apply it to emoji reactions
2020-01-28 22:40:15 +02: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
Shpuld Shpuldson
c54111797a
add emoji reactions to changelog
2020-01-28 17:54:40 +02:00
Shpuld Shpuldson
29806c9629
fix emoji reaction classes broken in develop
2020-01-28 17:53:47 +02:00
lain
73253b87bf
Merge branch 'feat/emoji-reactions' into 'develop'
...
Emoji reactions
See merge request pleroma/pleroma-fe!1049
2020-01-28 15:24:56 +00:00
Shpuld Shpuldson
6afff4f8c2
review changes
2020-01-28 17:09:25 +02:00
HJ
4a11ee9768
Merge branch 'fix-password-and-email-update' into 'develop'
...
Fix email and password forms in user settings
See merge request pleroma/pleroma-fe!1050
2020-01-28 11:13:17 +00:00
eugenijm
566f013ac4
Fix password and email update
2020-01-28 06:12:32 +03:00
Henry Jameson
b63e679a31
removed one color TODO
2020-01-28 02:03:21 +02:00
Henry Jameson
53a15eec7d
add theme to list
2020-01-28 01:31:37 +02:00
Henry Jameson
526b43eba6
Kenomo (see: #624 ) theme. Ability to define link color for post contents. Fixes
2020-01-28 01:29:20 +02:00
Henry Jameson
18ca2a035b
fix rgba function, whoops
2020-01-28 00:26:10 +02:00
Shpuld Shpuldson
4e04079739
Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe into feat/emoji-reactions
2020-01-27 18:44:25 +02:00
Shpuld Shpuldson
e6291e4ee1
remove unnecessary anonymous function
2020-01-27 18:43:26 +02:00
