83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
2017-09-28 08:55:53 +02:00
2f079573ed
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
2017-09-24 05:58:30 +02:00
dae0af1fd2
Change mobile layout breakpoint from 1024px to 630px ( #5063 )
...
630px = Drawer + 1 Column
2017-09-24 01:25:07 +02:00
5b8d0ad71b
Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )
2017-09-24 00:40:10 +02:00
233258c61b
Fix media gallery CSS ( #5064 )
2017-09-24 00:33:26 +02:00
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
2017-09-23 23:38:24 +02:00
67f8277526
Add secondary toot button (opt-in) ( #153 )
...
Add secondary toot button + other toot button enhancements.
Squashing so it's easy to revert if needed.
2017-09-23 23:11:02 +02:00
838f255fc2
Fix overflowing tabs in account__action-bar ( #5056 )
...
* Fix numbers in accounts columns
* Support edge compact-header
2017-09-23 21:06:16 +02:00
1e02ba111a
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
2017-09-23 14:47:32 +02:00
66126f3021
Add custom emojis to the emoji picker ( #5052 )
2017-09-23 05:40:28 +02:00
846cd4e838
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
2017-09-23 01:41:00 +02:00
169d83f532
Remove "extra clickable spaces" made obsolete by status re-design
2017-09-23 00:33:35 +02:00
31dd261375
applied blackle's fix for gallery offset with full-width media
2017-09-22 21:47:14 +02:00
034fab39ab
Make dropdowns render into portal, expand animation ( #5018 )
...
* Make dropdowns render into portal, expand animation
* Improve actions modal style
2017-09-22 04:59:17 +02:00
c2b479efec
Long display names now ellipsis properly
2017-09-21 16:55:32 -07:00
a94dc21c79
Styling fixes for header redesign
2017-09-21 16:46:18 -07:00
9512db920c
Merge pull request #148 from glitch-soc/better-header
...
Improvements to status headers and content
2017-09-21 16:11:03 -05:00
9ed51cecd0
Fixed notification appearance
2017-09-20 14:52:01 -07:00
cbf00168f1
add scrollbar to mojon suggestions list when too long
2017-09-20 21:53:08 +02:00
8cb4561145
Remove unnecessary css property ( #5025 )
2017-09-20 15:26:22 +02:00
769f62d96f
Improvements to status headers
2017-09-20 01:57:08 -07:00
b35406b700
Fix custom emojis with non-1:1 aspect ratio being stretched ( #5017 )
2017-09-20 03:38:38 +02:00
3d640dc8ac
Add will-change to improve scrolling perf ( #5001 )
2017-09-18 23:29:15 +02:00
b0487488a7
Re-center hidden media text vertical
2017-09-16 11:44:31 -05:00
7ebd6ed03c
Apply white-space: nowrap to account relationships icons
2017-09-14 07:37:39 -05:00
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
4f0597d579
Give video player fluid max-width ( #4935 )
2017-09-14 04:03:00 +02:00
2bbf987a0a
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
2017-09-14 03:39:10 +02:00
67ad453373
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
2017-09-09 23:56:21 -05:00
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
b9f7bc149b
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
2017-09-09 14:27:47 -05:00
7d853b514a
Use <button> instead of <div role="button"> ( #4835 )
2017-09-07 16:18:41 +02:00
13ffa3c59e
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
2017-09-06 17:32:15 +02:00
d8d2a54741
fix text position of NSFW for video file ( #4819 )
2017-09-06 13:55:47 +02:00
4c3dd0b254
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
2017-09-05 12:31:24 +02:00
2a5d1d5a1b
fix text position of NSFW in Safari (Mac/iPhone) ( #4570 )
2017-09-02 18:52:56 +02:00
ba8fb2fd0f
Add text color style for noscript link ( #4772 )
2017-09-02 14:02:15 +02:00
7dc5035031
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
2017-09-01 16:20:16 +02:00
d1a78eba15
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
2017-08-31 03:38:35 +02:00
07994eed00
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
2017-08-28 00:01:07 +02:00
8ecfdd8795
Set margin between character-counter and compose-form__buttons ( #4698 )
...
For some languages publish translation is long.
2017-08-26 14:23:20 +02:00
4cbb638604
Fix visual line-break glitch with .invisible parts of links ( #4655 )
2017-08-21 17:59:34 +02:00
d9a1fb134a
Fix emoji picker scrollbar style ( #4572 )
2017-08-10 13:41:12 +02:00
4dc0ddc601
fix regression - collapse button not working
2017-08-07 22:46:24 +02:00
7a1ca8b0df
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
b8791ae79b
always put @handles on a new line. undo some needless changes from prev cmmt
2017-08-07 21:59:49 +02:00
b9a2ceca35
removed ellipsis from .display-name
2017-08-07 21:24:19 +02:00
8eb6d171e6
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
2017-08-07 20:32:03 +02:00
Ondřej Hruška
Eugen Rochko
Lynx Kotoura
kibigo!
David Yip
TomoyaShibata
Nolan Lawson
Surinna Curtis
PFM
voidSatisfaction
Lynx Kotoura
Yamagishi Kazutoshi
Sorin Davidoi