hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4253 commits 4 branches 0 tags 44 MiB
Commit graph

4253 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
c6063a128e Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  Refactor i18n messages for MRF policy disclosure
  Improve default ToS
 2020-02-18 00:25:03 +02:00
Henry Jameson
c7ae982115 Merge branch 'themes-accent' into shigusegubu 
* themes-accent:
  update headers in switcher to better separate the subsections
  paper theme, updated todo, lol
  improve the display of disabled buttons
  attempt to fix some bugs with shadows control
  fix #774
  revert emoji reaction style
 2020-02-18 00:24:31 +02:00
Henry Jameson
171f4c7ddb update headers in switcher to better separate the subsections 2020-02-18 00:01:48 +02:00
Henry Jameson
1e95a0795a paper theme, updated todo, lol 2020-02-17 23:59:52 +02:00
Henry Jameson
3b3a31b461 improve the display of disabled buttons 2020-02-17 23:43:56 +02:00
Henry Jameson
5c6046ea0a attempt to fix some bugs with shadows control 2020-02-17 23:43:35 +02:00
Henry Jameson
76323d6d9a fix #774 2020-02-17 22:38:24 +02:00
Henry Jameson
e36647e95e revert emoji reaction style 2020-02-17 22:28:14 +02:00
Henry Jameson
0cabfe225b Merge branch 'themes-accent' into shigusegubu 
* themes-accent:
  fix pressed button in top bar
 2020-02-13 21:56:05 +02:00
Henry Jameson
c43325acd7 fix pressed button in top bar 2020-02-13 21:39:14 +02:00
Shpuld Shpludson
21f6120e9d Merge branch 'refactor/i18n-messages-for-mrf-policy-disclosure' into 'develop' 
Refactor i18n messages for MRF policy disclosure

See merge request pleroma/pleroma-fe!1062
 2020-02-13 09:43:56 +00:00
Hakaba Hitoyo
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
Hakaba Hitoyo
823a303f8a Improve default ToS 2020-02-13 09:41:31 +00:00
Henry Jameson
fb2fd32517 Merge branch 'themes-accent' into shigusegubu 
* themes-accent:
  dismiss warning when selecting other themes, fix collapsed attachments link color
  properly clear theme
  fixed transparent + semi-transparent inheritance case
  post-merge fix
  fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy themes to have derived colors instead of fixed ones.
  Emoji Reactions - fixes and improvements
  MRF Keyword Policy Disclosure
  Include non-gallery attachments and distinguish between images and videos
  Indicate whether collapsed statuses contain gallery media or link preview cards
  Add option text
  Add `with_move` param for fetching notification
  Change to hide User migrates tab when allow following move
  Add setting for allow_following_move
 2020-02-12 01:29:57 +02: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
Henry Jameson
08c0694a5b fixed transparent + semi-transparent inheritance case 2020-02-11 18:21:03 +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
ba8cbd6ca7 Merge branch 'themes-accent' into shigusegubu 
* themes-accent:
  don't use cache for theme data
 2020-02-11 10:43:53 +02:00
Henry Jameson
29133fb008 don't use cache for theme data 2020-02-11 10:42:15 +02:00
Henry Jameson
25f785770c Merge branch 'themes-accent' into shigusegubu 
* themes-accent: (83 commits)
  fix and update changelog
  fix/remove contrast ratios
  removed base16-related code
  fix warning stylings
  fixed eslint, made `mod` work properly depending on context including in shadows
  Better Disabled buttons support. Mammal theme fixes. Implemented proper context-aware `mod` argument - now checks lightness of "variant" color. needs retesting tho
  updated preview to account for underlay
  update button toggled state, apply it to emoji reactions
  removed one color TODO
  add theme to list
  Kenomo (see: #624) theme. Ability to define link color for post contents. Fixes
  fix rgba function, whoops
  lint
  fix rgba css generation, add some tests to automatically verify that themes are generated properly
  fix transparent color not affecting downstream slots
  fix icons in menus
  improved selectedMenu again
  popover/selected menu improvements
  separate actual theme data from theme framework
  revert fgText -> text after some consideration. case was fixed already in other way
  ...
 2020-02-11 10:09:54 +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
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
Hakaba Hitoyo
dafced3a86 MRF Keyword Policy Disclosure 2020-02-10 08:04:58 +00:00
Henry Jameson
b3500842aa Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields
 2020-02-09 21:32:40 +02: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
feld
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