* upstream/develop: (83 commits)
Password reset page
add a comment
force img updating immediately
Fixed "sequimiento" to "seguimiento".
Replace `/api/externalprofile/show.json` with a MastoAPI equialent
Use mastodon api in follow requests
"Optional" in lowercase.
Update es.json
fix pin/unpin status logic
rename a mutation
update
fix user avatar fallback logic
remove dead code
Corrected "Media Proxy" translation.
Update es.json
make bio textarea resizable vertically only
remove dead code
Make image orientation consistent on FF, fix videos w/ modal
remove dead code
fix crazy watch logic in conversation
...
* upstream/develop:
review
review
Update emoji-input.js
Misc fixes: Fix uploads stretching on chrome, fix warnings in console
apply font smoothing in webkit and firefox
fix user search
Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
properly position the caret after replacement
Apply suggestion to src/services/api/api.service.js
fix MFA crashing on user-settings page
fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
getting and setting user background via MastoAPI
Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
fix small annoyance
fixed some bugs i found, also cleaned up some stuff + documentation
self-review
Linting
* upstream/develop: (51 commits)
fix convos
resolve focus issue in the auto-complete for name field
resolve issue related to event handler
resolve issue in prop binding
this fixes#350 - v-model binding issue
#341 - fix naming
#341 - automatic scroll with repeats/reports
345 - fix long username issue in repeat status
Update spanish translate - es.json
Fix return
Fix clicking link - open new tab unless tag or mention
Fix max-width of profile banner in setting
Fix unit test
Typo
#332 - add follow/not follow button to follow list
Add quick css fix for user profile bg img preview
Switch into Lodash
Switch into Lodash
Change the async stuff to not render app before theme is loaded
fixing conflicts
...
* upstream/develop: (108 commits)
Update user settings text: staff badges are only visible in user profile
Fix naming
Show back followees/followers counts
Always show my own followees/followers
Hide followers and followees tabs when they are disabled
#137 - clean up emoji list
#315 - revert changes
#315 - separate export and fetch follows logic
#137 - add red heart emoji
Grammar
Fix repeater html not showing properly
#301 - add an option for default formatting
#315 - clean up the request
remove unnecessary div
#315 - export all follows as CSV
Make role badge visible only on user profile page
Add theming support for admin/moderator badges
Refactor visibleRole for better readability
Allow to configure visibility for admin and moderator badges
Add admin and moderator indicators to the user card
...
* upstream/develop:
"spring" cleaning
review
Fix who to follow panel shuffling
Always send "hide_network" when updating user profile
fix custom nsfwCensorImage not working
fix reply-to tooltip being somewhat unreliable
Revert "fix reply-to tooltip being somewhat unreliable"
fix reply-to tooltip being somewhat unreliable
fix errors in console
* upstream/develop: (32 commits)
[Debug] Avoid duplicates in the who to follow panel
updated German translation * added theme settings * added various missing single strings
Fix translation typo in registration.vue
Update README
Fix profiles without statuses not loading
Fix conflicting styles
Remove commented out back button
Cleanup and remove divider element in side drawer
New routes, notifications, other impovements in side drwaer
Add "noAttachmentLinks" to src/modules/instance.js
Make "noAttachmentLinks" configurable
No attachment links
Treat reserved users like external users in the frontend.
User Card Content fixes and updates
scopeCopy → true by default
Restore old routes, enable user route as fallback.
improve web push notifications
fix
Update japanese translation
fix inconsistencies within who_to_follow_panel
...
* upstream/develop: (38 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
clean up the unused stuff
Make user profile page cleaner
missing string and unification with counters (order)
collateral fix for tab display
collateral fixes for user-card: use still-image, styles for custom emoji
Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs.
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Fix style
Add a way to get new captcha on click
Fix style
Separate captcha into the backendInteractor
more visual fixes
changed bottom-shadow hiding method to be more compatible with overflow
small fix for overflowing tab-switcher
...
* feature/theming2:
Fix iOS Safari from making videos play fullscreen by default
added PR comments
resolved the lint
used the deleted data param as condition in status template
Switch to "timeline" when pressing user-settings
Added user setting tooltip
made links in user bio always open in new tabs
addressed PR comments
added tooltip
Add userId property to timelines so that we don't overwrite user timeline meant for another user
Added option to auto-hide subject field when it's empty.
removes hacks from notifications storage, adds api call to let server update is_seen attribute
fixes vimium not giving retweet button a hint
Do not use underscore at the beginning of the method
Logout user on password change
Route user to the correct profile URL
Typo
Fix filetype detection
Switch to settings when touching settings
Switch to timeline on nav panel actions
* feature/theming2: (124 commits)
whoops
whoops
redmond update
better preview, collateral fixes
theme separation
more styles
cosmetic fixes
font control args to allow passing an option list of fonts, for future use
more fonts
initial font support
clean up
validity checks, no longer exploding when something is invalid
DM timeline: stream new statuses
collateral fixes
fixed indentation
some help strings
reset buttons, better disabled for shadows
added "keep opacity" option, fixed opacity loading, fixed missing shadows not affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
fix v1->v2 transition for localstorage
radii v1 fixes
...
* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
* upstream/develop: (36 commits)
remove deploy stage
remove deploy stage
updated and completed German translation
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Count spoiler text in the character count. Fixes#135.
Added Irish (Gaeilge) Language
Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
simplify code
adapt to destructive change of api
Adds Occitan locale
Updated italian translation
Update oc.json
Update oc.json
Update of the oc.json file Actualizacion del fichièr oc.json
Sort messages object by language code so that it's easier from the UI to browse them.
explicitly set collapseMessageWithSubject to undefined
Fall back to instance settings consistently
...
* develop:
small fix
Made showing format selection optional and default to false
Fix mistakes
Change styles a bit, make pre-formatted blocks not overflow but scroll
Add styles for h1/2/3/4/5 tags in status html
post status form: styling fixes for content-type selector, align icons with selector
Pass user id to fetchFriends
i18n: make "plain text" translatable
add the ability to select a post's content type
fix
Add titles to source/expand buttons
Add titles to post visibility icons
* polish:
added option for logo in navbar to follow color scheme of the rest of the site also fixed potential mess-up between api/static configs
i18n: make "plain text" translatable
add the ability to select a post's content type
* upstream/develop:
Rename expandCW to collapseMessageWithSubject.
fix indent
Add support for configurable CW clickthrough.
Merge upstream
fix lint issues
allow default visibility scope to be configured
Add validation of the imported theme and the corresponding warning message
Unify button styles and use min-width
Add German localization for theme import/export
Add theme import feature
Refactor theme settings state initialization
Add theme export feature
