0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
3398d0e84c
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit b14d2a5ae641832d083e
7 years ago
9ad1bfbc18
In detail status view, display attachment uncropped if there's only one ( #5054 )
...
* In detail status view, display attachment uncropped if there's only one
* Make media spoiler the size of the media it hides, enable on static
7 years ago
ba676acb6e
Change mobile layout breakpoint from 1024px to 630px ( #5063 )
...
630px = Drawer + 1 Column
7 years ago
6a42ddd01c
Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )
7 years ago
b8a3a45da1
Fix media gallery CSS ( #5064 )
7 years ago
3b79104d29
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
7 years ago
b65e03fd0f
Add secondary toot button (opt-in) ( #153 )
...
Add secondary toot button + other toot button enhancements.
Squashing so it's easy to revert if needed.
7 years ago
2063f622df
Fix overflowing tabs in account__action-bar ( #5056 )
...
* Fix numbers in accounts columns
* Support edge compact-header
7 years ago
da257754b5
Add emoji autosuggest ( #5053 )
...
* Add emoji autosuggest
Some credit goes to glitch-soc/mastodon#149
* Remove server-side shortcode->unicode conversion
* Insert shortcode when suggestion is custom emoji
* Remove remnant of server-side emojis
* Update style of autosuggestions
* Fix wrong emoji filenames generated in autosuggest item
* Do not lazy load emoji picker, as that no longer works
* Fix custom emoji autosuggest
* Fix multiple "Custom" categories getting added to emoji index, only add once
7 years ago
4a0212bf2f
Add custom emojis to the emoji picker ( #5052 )
7 years ago
16a5d1450c
Switch from EmojiOne to Twemoji, different emoji picker ( #5046 )
...
* Switch from EmojiOne to Twemoji, different emoji picker
* Make emoji-mart use a local spritesheet
* Fix emojify test
* yarn manage:translations
7 years ago
ba7fbb92a7
Remove "extra clickable spaces" made obsolete by status re-design
7 years ago
1325ec8b1d
applied blackle's fix for gallery offset with full-width media
7 years ago
f7810f56a1
Make dropdowns render into portal, expand animation ( #5018 )
...
* Make dropdowns render into portal, expand animation
* Improve actions modal style
7 years ago
123d22f3b8
Long display names now ellipsis properly
7 years ago
e1fc279dfd
Styling fixes for header redesign
7 years ago
93bd063524
Merge pull request #148 from glitch-soc/better-header
...
Improvements to status headers and content
7 years ago
47bc505c25
Fixed notification appearance
7 years ago
0ddaea5d9d
add scrollbar to mojon suggestions list when too long
7 years ago
28e4e7b4a0
Remove unnecessary css property ( #5025 )
7 years ago
76fda20779
Improvements to status headers
7 years ago
4e4a803ee3
Fix custom emojis with non-1:1 aspect ratio being stretched ( #5017 )
7 years ago
6c31ded9f7
Add will-change to improve scrolling perf ( #5001 )
7 years ago
8958d8c131
Re-center hidden media text vertical
7 years ago
f55b76afba
Apply white-space: nowrap to account relationships icons
7 years ago
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
7 years ago
baa806794f
Give video player fluid max-width ( #4935 )
7 years ago
fbec33df62
Redesign video player ( #4911 )
...
* Redesign video player
* Use new video player on static public pages too
* Use media gallery component on static public pages too
* Pause video when hiding it
* Full-screen sizing on WebKit
* Add aria labels to video player buttons
* Display link card on public status page
* Fix fullscreen from modal sizing issue
* Remove contain: strict property to fix fullscreen from columns
7 years ago
017738c604
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
7 years ago
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
da3f22ee7d
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
7 years ago
3c816b0a77
Use <button> instead of <div role="button"> ( #4835 )
7 years ago
d4e8f77a8b
Add Smartphone screen favourite back button and adjust styles ( #4813 )
...
* Feat add get-back button on favourite columnHeader
* Style adjust nice looking get-back button
* Fix delete media query and add padding right
* fix: restore padding and add lastchild style for back-button
7 years ago
3c7f76265c
fix text position of NSFW for video file ( #4819 )
7 years ago
5a27eaae7c
Adjust status embeds ( #4808 )
...
* Adjust status embeds
Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.
* Remove trailing whitespace
* Using width from the variable
7 years ago
6fcb8ac737
fix text position of NSFW in Safari (Mac/iPhone) ( #4570 )
7 years ago
5a3e81e963
Add text color style for noscript link ( #4772 )
7 years ago
e9e271878e
Make PreviewCard records reuseable between statuses ( #4642 )
...
* Make PreviewCard records reuseable between statuses
**Warning!** Migration truncates preview_cards tablec
* Allow a wider thumbnail for link preview, display it in horizontal layout (#4648 )
* Delete preview cards files before truncating
* Rename old table instead of truncating it
* Add mastodon:maintenance:remove_deprecated_preview_cards
* Ignore deprecated_preview_cards in schema definition
* Fix null behaviour
7 years ago
ad769409f7
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
7 years ago
5c10e23880
Adjust "signed in as" pages ( #4720 )
...
* Adjust "signed in as" pages
Fix min-width
Set width of .account-header .name
To apply text-overflow and overflow settings
Set overflow for detailed-status__display-name
* Remove trailing whitespace
7 years ago
1914a8b8a8
Set margin between character-counter and compose-form__buttons ( #4698 )
...
For some languages publish translation is long.
7 years ago
672ee8219c
Fix visual line-break glitch with .invisible parts of links ( #4655 )
7 years ago
060a345217
Fix emoji picker scrollbar style ( #4572 )
7 years ago
eee33e230a
fix regression - collapse button not working
7 years ago
913dd13575
Merge remote-tracking branch 'upstream/master'
7 years ago
46a9e9d7ea
always put @handles on a new line. undo some needless changes from prev cmmt
7 years ago
782f21ca4b
removed ellipsis from .display-name
7 years ago
ed7abec8f5
feat: Cache status height to avoid expensive renders ( #4439 )
...
* feat: Cache status height to avoid expensive renders
* feat: Escape content and emojify in reducers
* fix(css): Remove backface-visibility: hidden from .scrollable
* fix(statuses): Avoid creating DOMParses inside a loop
7 years ago
Ondřej Hruška
Eugen Rochko
Lynx Kotoura
kibigo!
David Yip
TomoyaShibata
Nolan Lawson
Surinna Curtis
PFM
voidSatisfaction
Lynx Kotoura
Yamagishi Kazutoshi
Sorin Davidoi