Commit graph

281 commits

Author SHA1 Message Date
Shpuld Shpludson
a8e9c05f09 Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option

See merge request pleroma/pleroma-fe!1106
2020-05-20 15:42:42 +00:00
Mark Felder
2135dc8510 Merge branch 'develop' into feat/sidebar-alignment 2020-05-15 12:26:38 -05:00
Mark Felder
840c6f40b6 Merge branch 'develop' into chore/remote-unused-option 2020-05-14 12:22:28 -05:00
Mark Felder
0ef5965b3b Add missing settings: disableChat, greentext, hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename 2020-05-13 14:52:48 -05:00
Mark Felder
1db2fc3f41 alpha sort 2020-05-13 14:52:21 -05:00
Mark Felder
c2bba3f5ad Remove unused noAttachmentLinks option 2020-05-13 14:28:35 -05:00
Mark Felder
bc5005b3dd Permit sidebar alignment with instance configuration option 2020-05-12 13:59:52 -05:00
Shpuld Shpludson
f4676e17d3 Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
#   static/fontello.json
2020-05-08 08:20:03 +00:00
Henry Jameson
b5afffdac4 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (28 commits)
  Update CHANGELOG.md
  don't dismiss a rejected follow request on server
  mark single notifs as seen properly on server
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  Add support for follow request notifications
  Update CHANGELOG.md
  Update CHANGELOG.md
  Prioritize custom emoji a lot and boost exact matches to the top
  Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting
  Refactor status showing/hiding code for better handling of edge cases and easier comprehension
  Fix user names with the RTL char in notifications
  Fix pagination
  Update CHANGELOG.md
  don't dismiss a rejected follow request on server
  mark single notifs as seen properly on server
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  Update CHANGELOG.md
  remove with_move param
  Add support for follow request notifications
  Update CHANGELOG.md
  ...
2020-05-02 19:53:41 +03:00
eugenijm
01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Mark Felder
8c5946b728 Add button in 3dot menu to copy status link to clipboard 2020-03-30 12:39:28 -05:00
Henry Jameson
6595083003 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Apply suggestion to src/modules/instance.js
  Fix/popover performance
  make theme loading work with source-only presets
  remove bloat from themes
  update using variables
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  make panel header highlight less harsh
  update pleroma-dark and pleroma-light
  stop using customTheme in user card, instead use color slots. fix for opacity inheritance polluting inheritors
  Fix user activation/deactivation, deletion, and role assignment in the moderation menu
2020-02-29 15:35:46 +02:00
Shpuld Shpuldson
1fb91b1795 remove bloat from themes 2020-02-22 10:34:54 +02:00
Shpuld Shpuldson
b5c6b77ca8 update using variables 2020-02-22 10:03:16 +02:00
Shpuld Shpludson
8c454b9456 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:31 +00:00
Shpuld Shpludson
c9935362de Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:29 +00:00
Shpuld Shpludson
19cc739598 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:25 +00:00
Shpuld Shpludson
e342dbcb10 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:21 +00:00
Shpuld Shpuldson
64a6ba219a make panel header highlight less harsh 2020-02-20 21:14:42 +02:00
Shpuld Shpuldson
8bb5d775b4 update pleroma-dark and pleroma-light 2020-02-20 20:47:24 +02: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
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
1e95a0795a paper theme, updated todo, lol 2020-02-17 23:59:52 +02: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
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
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
e6f148b8a3 removed base16-related code 2020-02-11 00:59:07 +02:00
xenofem
36e19128bf Indicate whether collapsed statuses contain gallery media or link preview cards 2020-02-08 13:15:09 -05: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
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
948fd2086b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (21 commits)
  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
  Add AMOLED dark theme
  mfa fix
  unify showimmideately
  Some error handling
  wire up staff accounts with correct store data
  remove unused fallback
  Add user migrates filter to interactions
  change the expression of `move`
  Fix target account link
  Add view for moves notifications
  ...
2020-01-27 23:32:54 +02:00
Henry Jameson
7c074b8741 fix rgba css generation, add some tests to automatically verify that themes are
generated properly
2020-01-27 04:20:13 +02:00
Henry Jameson
b96993e4dd improved selectedMenu again 2020-01-24 00:36:32 +02:00
Henry Jameson
644ce497a0 lightBg -> highlight because it causes issues with v2 2020-01-22 01:28:46 +02:00
Henry Jameson
6e1c538e41 multiple fixes to make style switcher not die. Made shadows work, incuding compatibility 2020-01-20 01:31:54 +02:00
Henry Jameson
1f5ada08c1 themes update 2020-01-16 23:29:19 +02:00
Henry Jameson
9af0042452 updated breezy theme 2020-01-13 02:02:40 +02:00
Henry Jameson
f31ed7e5a8 remove snapshot data from breezy 2020-01-12 03:53:08 +02:00
Sierra
ae2ae00d41 Add AMOLED dark theme 2020-01-07 21:13:51 +00:00
HJ
215662afde Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
#   static/fontello.json
2020-01-03 09:05:48 +00:00
Henry Jameson
4bb1c98e0f Replaced v3compat with source to reduce code complexity. Made more slots
customizable. `theme` now contains a snapshot of theme generated for better
compatiblity and future-proofing
2020-01-02 20:36:10 +02:00
Henry Jameson
332d31dc02 support for "transparent" color keyword 2019-12-30 00:45:48 +02:00
Henry Jameson
e5a34870f0 Accent works 2019-12-28 15:55:42 +02:00
Henry Jameson
75bdeab0a0 Merge branch 'streaming' into shigusegubu
* streaming: (51 commits)
  toggle_activation api is also deprecated
  use vuex action
  refactor toggleActivationStatus
  replace setActivationStatus api with new one
  use flex for stickers
  i18n/update-ja_easy
  Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
  Add fallback in case BE does not report federating status in nodeinfo
  The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
  Logic should be to hide TWKN if not federating OR if instance is not public
  Finally trust eslint
  More lint
  More lint
  Lint
  mfa: removed unused code
  increase icon width a little bit in the nav panel
  add icons to nav panel
  Revert "Merge branch 'revert-96cab6d8' into 'develop'"
  Support "native" captcha
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
  ...
2019-12-26 13:21:53 +02:00
taehoon
7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
Henry Jameson
b6b7bc5852 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (24 commits)
  Remove whitespace hack on empty post content
  Change output directory of fontello
  add html-webpack-plugin to karma config
  use another fork of fontello-webpack-plugin
  add animate-spin class
  remove needless code
  use another approach for versioning font files
  versioning the font resources through webpack
  fix "can't find property of undefined" errors in mrf transparency panel
  move mention button right next to mute button
  restore muted users collapsing logic on other user’s profiles
  [i18n] Improve easy/pedantic Japanese switching
  Normalize profile fields
  backend interactor service: implement startFetchingFollowRequest
  show badge visibility user setting checkbox only if needed
  Use kana+kanji as default for Japanese translation
  Remove outdated changelog file
  Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
  use yarn, try to restart pipeline
  tests + updates
  ...
2019-12-10 23:08:45 +02:00