Commit graph

254 commits

Author SHA1 Message Date
Henry Jameson
893741c363 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Fix the chat scroll behavior for vertical screens.
  fix mobile badge alignment
  change approach to disable all, enable some
  fix mobile navbar hitboxes
  Instead of blocking all interaction, only block interaction in places that matter
  added comment
  fix chat heading not being aligned and using wrong styles
  fix chat badge and unify styles across all badges including follow request count.
  change logo to svg
  Update CHANGELOG.md
  update changelog for optimistic chat posting
  fix test
  move from using timestamps to ids when tracking last seen in chats
  Apply 1 suggestion(s) to 1 file(s)
  Optimistic message sending for chat
2020-11-08 14:56:51 +02:00
Henry Jameson
3db218dec1 change logo to svg 2020-11-02 19:37:01 +02:00
Henry Jameson
633349ddff Refactor desktop navbar into a component, change layout to grid for
better compatibility with search field and simpler CSS
2020-10-29 22:54:28 +02:00
Henry Jameson
41d08653b5 Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix play-on-hover gifs issues
  fix preview spinner
  Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS
2020-10-29 22:22:07 +02:00
Henry Jameson
84ad944734 Refactor desktop navbar into a component, change layout to grid for
better compatibility with search field and simpler CSS
2020-10-29 22:15:02 +02:00
Henry Jameson
b583b3d291 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (38 commits)
  >boxes
  better icon for picker
  fix settings tabs on mobile, update follow request badge
  update & unify the navbars heights
  improved side-drawer alignments
  improved the semantics for our icon scale, fixed preview, fixed navbar desktop
  Translated using Weblate (Chinese (Simplified))
  make subjectline input use size=1 for compatibility with CJK fonts
  fontello aftermath
  bye bye fontello
  lint
  rotate the shackle of the lock for better accessibility
  come on and slam
  fix attachment remove pointer
  remaining changes...
  more replacements + small renames
  More stuff. Buttons in user card's corner now have MUCH bigger hitboxes
  cancel -> times
  chevrons-downs, settings
  more FA5 stuff with small related refactoring
  ...
2020-10-28 23:27:43 +02:00
Henry Jameson
1b50d700aa bye bye fontello 2020-10-21 00:34:42 +03:00
Henry Jameson
8e76a1dc53 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (23 commits)
  change icon to a megaphone
  change side drawer to use shoutbox name
  update changelog
  Fix chat messages being missed when the streaming is disabled and the messages are sent by both participants simultaneously
  Fix the chat list order and last message timestamp updates
  change a eslint disable to nextline only
  fix vue warnings and errors
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  Do not show desktop notifications for your own chat messages
  Add hacky functionality to open specific settings tabs
  Password reset no longer informs user of errors or account existence
  add changelog entry
  hide poll when subject collapsed, but show poll icon
  update changelog for autocomplete fixes
  update changelog with 2.1.0, fix Add -> Added in older releases
  Rewrite word split imperatively for control
  wip start
  ...
2020-09-17 23:24:03 +03:00
Shpuld Shpuldson
20d33c2fbc change icon to a megaphone 2020-09-16 11:53:54 +03:00
Henry Jameson
13bab19494 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Apply suggestion to src/components/chat_list/chat_list.vue
  Add the single-line prop to StatusContent and use it for chat list items
  Remove direct style manipulations in favor of classes
  Undo the promise rejection on the json parser error in promisedRequest
  Add the empty chat list placeholder.
  Disable status preview in the chat posting form
  Address feedback
  Add Chats
2020-07-10 12:17:55 +03:00
Henry Jameson
4e8499abad Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (38 commits)
  give notification timeago a min width
  streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff
  corrected tos.html location
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (Finnish)
  Apply suggestion to src/components/staff_panel/staff_panel.js
  StaffPanel: Move staff loading to panel creation.
  Apply suggestion to src/boot/after_store.js
  fix preview opening automatically
  After Store: Correctly handle preloaded HTML
  remove console log
  fix issue on posting another status
  remove unnecessary code
  add more ways to set description
  fix edge case of videos and unknown files together
  fix modal types check being broken
  don't close preview on post, move visibility notices above the preview where they belong
  remove contenttype check from content type watcher
  ...
2020-07-08 20:03:52 +03:00
eugenijm
aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Dym Sohin
1767ee01d0 corrected tos.html location 2020-07-07 19:34:45 +00: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
Henry Jameson
7d81d11338 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (41 commits)
  Apply suggestion to src/components/notifications/notifications.js
  fix height for emoji panel of settings modal
  Add bookmarks
  FE part of BE issue 1586 provide index md
  change alert popup alpha
  add follow request users to store
  make the addNotice dispatch return the notice
  change storage error one-off into a global notice system
  remove accidental log
  revert accidental change in instance.js
  update the message and changelog
  catch localforage error and let the application work, add an alert for user to dismiss
  document the 'mark-as-read-detection' system
  allow overscrolling enough to not have FAB block interactables
  add initial fetching back in a more streamlined way
  remove unnecessary fetchAndUpdate, change notifications fetcher to not double fetch
  change Show New text to Reload when flushing
  Make use of backend reply filtering
  update changelog for reply-to strikethrough
  add no-statusId support for status popover
  ...
2020-07-05 15:46:34 +03:00
Eugenij
de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
96d2c86d3b change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component 2020-06-29 14:48:22 +03:00
Henry Jameson
eb10e7edf6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (40 commits)
  Poll, StatusContent: Move emoji css to status body.
  remove recentqueries thing
  fix width of long field value
  change key-value to look like one
  revert import style
  return the correct promise type from action
  update changelog
  remove search blocker, fix debounce params
  resume the previous emoji size for now
  restyle the fields
  Update popover.js
  update changelog
  disable subject field when posting
  remove log whoops
  fix popovers cutting off in notifications, port popover changes from chats mr
  Changelog: Add info about poll option emoji.
  changelog
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  Polls: Construct an html field during normalization.
  fix #866
  ...
2020-06-19 15:50:43 +03:00
Henry Jameson
e4b18deece fix redmond themes 2020-06-13 13:16:53 +03:00
lain
fd109fa355 Merge branch 'develop' into 'chore/improve-default-tos'
# Conflicts:
#   static/terms-of-service.html
2020-06-12 14:17:56 +00:00
Henry Jameson
721fde9f3f Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  remove timeout, was meant for testing
  fix tests. user-profile didn't have tab-switcher compnent imported!!
  fix cursor on desktop, add modal link on mobile
  Improve settings-modal async loading, update vue to 2.6.11 to be able to use Vue.observable, to implmement resettable async component
  icons update
  scroll to top when switching tabs
  added "settings saved" notice back
  eslint --fix + small fix
  cleanup
  split modal's content into another component, add lazy loading
  misc fixes
  Multiple fixes for CSS, added proper auth checking
  moved stuff from settings, cleaned up naming for tabs, added close and peek
  initial work on settings modal
2020-05-25 16:38:06 +03:00
Henry Jameson
a6ca923a76 icons update 2020-05-25 16:10:43 +03:00
Henry Jameson
071b3c13e6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* 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-23 02:27:43 +03:00
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