* upstream/develop:
Move the epigraph after the heading so MkDocs can pick up the heading
Add links to directions in the beginning of CONFIGURATION.md
CI: trigger doc rebuild on commits to develop
update admin url
update copy
add trailing slash to admin url
open in a new tab
add admin link to the side drawer
add admin link to nav
add gauge icon
fix regex shortcode problem
i18n/Update Pedantic Japanese Messages
i18n/Update Japanese Messages
reset post status form only when reply user is changed
Small refactoring in who to follow page
Feature/Add _Allow user discovery services_ preference
Added a setting to hide follow/follower count from the user profile
* emoji-selector-update: (24 commits)
fix aspect
Apply suggestion to src/components/emoji_input/emoji_input.js
scale emoji on hover
added emoji zoom for picker
fixed scroll when switching back to emoji
fixed some bugs, added spam mode, minor collateral fixes
fixed a lot of bugs with emoji picker, improved relevant components
initial attempts at making emoji-picker somewhat extensible
rename for consistency
linting
cleanup and appropriation for new emoji-input component API, styles updates
rename emoji-selector to emoji-picker
post-merge fix
#101 - remove unused code
#101 - bind outside click, add emoji to post status form
#101 - click outside of emoji implementation
#101 - update caret pos after emoji's inserted
#101 - bind scroll event, highlight relevent section by tabs
#101 - update hard-coded server url
merge develop
...
* 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: (116 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: (33 commits)
fix js error on mute
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Fix sent follow request detection
fix english settings label regarding how to view videos
fix extra buttons merge bug
make size of gif image and preview equal
css improvements
do not unmount post status modal in desktop
hide rich media preview image in case of broken image
Handle JSONified errors while registering
Focus on the search input when the search icon is clicked
prevent scrolling top when click search input
add zoom-in indication to avatar
add zoom-in icon
allow zooming avatar in profile panel header
use $route instead of $router.currentRoute
enlarge avatar in profile page
update unit test
...
* upstream/develop: (469 commits)
Feature/add sticker picker
guard more secure routes
guard secure routes by redirecting to root
closest can returns itself as well
find inside status-content div only
try to use the closest a tag as target
Update es.json
Also apply keyword filter to subjects
Remove files I accidentally pushed in
fix issues caused by merges in usersearch on @
Add user search at
fix eslint warnings
remove vue-popperjs
fix moderation menu partially hidden by usercard boundary
migrate popper css
rewrite ModerationTools using v-tooltip
make popover position for status action dropdow relative to parent node
rewrite ExtraButtons using v-tooltip
install v-tooltip
i18n/Update pedantic Japanese translation
...
* upstream/develop: (57 commits)
Feature/add sticker picker
guard more secure routes
guard secure routes by redirecting to root
closest can returns itself as well
find inside status-content div only
try to use the closest a tag as target
Update es.json
Also apply keyword filter to subjects
Remove files I accidentally pushed in
fix issues caused by merges in usersearch on @
Add user search at
fix eslint warnings
remove vue-popperjs
fix moderation menu partially hidden by usercard boundary
migrate popper css
rewrite ModerationTools using v-tooltip
make popover position for status action dropdow relative to parent node
rewrite ExtraButtons using v-tooltip
install v-tooltip
i18n/Update pedantic Japanese translation
...
* upstream/develop:
Feature/polls attempt 2
Update translation with review comments
Update file with current en.json
Update fr.json added missing ,
Update fr.json stoped at line 134, more to do below
* 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: (59 commits)
Fix pipelines and clean up console output
switch from method to computed property
formatting
add tags to data and to status component
Remove auto-hyphenation
make staff label visible
move visibility-tray css in local scope
refactor css
make only screen name as link
refactor css for visibility tray
moved setting styles into common to avoid bug with shared styles
hide three dot menu button if has no items
Eliminate automatic zooming on mobile
entity normalizer: add tooltip text to emojis
rename for consistency's sake
update admin api urls in accordance with new docs
Line up rich text format picker with the status form
fix lint
Cleanup, little documentation, localization
update api service functions
...
* upstream/develop: (85 commits)
entity normalizer: hook up in_reply_to_account_acct
add BBCode strings
fix follow button not updating bug in follow-card
refer searched user objects from the global user rep
set max-width of textarea in settings page
Remove space in the timeline setting copy
user_card.vue: Fix .emoji to apply to img
Update oc.json
Update oc.json
Update oc.json
Update oc.json
replace pencil with wrench icon
rebuild fontello with wrench icon added
fetch all friends using pagination
stop fetching user relationship when user is unauthorized
Revert "recover border between basic-user-card using list component"
remove extra spacing
code readability
fix typos
clean up
...
* upstream/feature/mobile-improvements-3:
add gesture to close notifications drawer
make notifications close on navigation
make mobile notifs drawer more like an actual drawer, make mobile nav buttons bigger to press, fix alert dot
remove notifications from sidebar, make notifications appear on login only
make nav bar slide, move mobile post status to mobile nav
more work with notifications drawer
start working on one tap notifications
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
* upstream/develop: (51 commits)
Add floating post-status button on mobile
Update user settings icon to pencil
I18n: Update Czech translation
user_card.vue: Copy over .status-content img styling
Make minId reset with minVisibleId to prevent gaps when showing new
Only connect to chat when authenticating in the first place
Check for websocket token before connecting to chat
user_card.vue: Set img.emoji to 32×32px
#432 - prevent post status form textarea keydown event propagation
Merge content types translations
Use a cross browser safe solution to get scroll top
Revert modifier class notation
Update classname
Update tests
Rename UserCardContent to UserCard
Update block class name of BasicUserCard component
Update modifier class notation
compatibility with upcoming changes
Re-do UserCardContent css
Load post status content type from instance config
...
* upstream/develop: (33 commits)
#383: content type error
#376: update status timeline when it's empty
#377: no exteral profile link for local users
#371: show notification when user setting's saved
Clean up CSS a bit
#364: update ap_id error with username
Rename: instanceSpecificPanelPresent
Hide isp option if instance has panel disabled
Take over branch and fix some issues
Fix lint errors
Better error handling
Remove cropped image size restriction
Remove modal component
Make embedded image cropper
Revert eslintrc changes
Check if variable exists before using
Remove event listeners when destory ImageCropper
Localization of ImageCropper component
Remove event listener when modal is destroyed
Crop avatar image using minWidth/minHeight
...
* 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
...
