beatrix
b1217242fc
Merge pull request #125 from glitch-soc/data-column
...
Add data-column="..." to all columns
2017-09-30 15:02:21 -04:00
Ondřej Hruška
e9f9e3cc89
unbreak onboarding modal
2017-09-28 11:13:37 +02:00
Ondřej Hruška
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
Ondřej Hruška
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
Eugen Rochko
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
Eugen Rochko
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
Nolan Lawson
b01ab55ed8
Fix PropTypes.oneOfType() warning ( #5041 )
2017-09-22 17:50:29 +02:00
Eugen Rochko
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
Nolan Lawson
798b0fc5af
Reduce wasted renders for column_loading.js ( #5021 )
...
* Reduce wasted renders for column_loading.js
* Use defaultProps
2017-09-20 19:58:44 +02:00
abcang
44245926f1
Fix cancellation of scroll to the right ( #4978 )
2017-09-17 11:59:23 +02:00
Surinna Curtis
323d437a09
satisfy eslint
2017-09-13 21:47:30 -05:00
Surinna Curtis
30b5254a5d
Put the label for the hide notifications checkbox in a label element.
2017-09-13 21:47:30 -05:00
Surinna Curtis
0a207be99d
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
Surinna Curtis
2ea9b164d3
Satisfy eslint.
2017-09-13 21:47:30 -05:00
Surinna Curtis
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
Eugen Rochko
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
abcang
60944d5dca
Fix height cache ( #4909 )
2017-09-13 10:24:33 +02:00
David Yip
932571fa22
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
Eugen Rochko
72e662bb0d
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
2017-09-10 10:26:01 +02:00
Eugen Rochko
f2cbfb2eb3
Fix dimensions of loading component for compose drawer ( #4872 )
2017-09-10 08:48:11 +02:00
David Yip
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
David Yip
14e1fb8d36
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -05:00
David Yip
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
Eugen Rochko
6867681c7c
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
voidSatisfaction
85c7c42098
Add Pinned toot column ( #4817 )
...
* Add Pinned_toot_section
* Fix add frozen_string_literal
* Fix delete no need controller and tests
* Fix replace query strings to axios params
* Fix change value to accountId and disabling more button
2017-09-07 09:58:11 +02:00
Surinna Curtis
8cc1ed3c55
Don't unconditionally call preventDefault and stopPropagation on all keyup events ( #4777 )
...
* UploadArea should only preventDefault for Escape
This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.
* Remove workaround for fixed bug in SettingToggle
SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
2017-09-02 16:27:16 +02:00
Yamagishi Kazutoshi
2305f7c391
Use system's default font on non web UI pages ( #4553 )
...
* Use system's default font on non web UI pages
* Remove import for Redirect
2017-09-01 16:13:31 +02:00
Surinna Curtis
173a970752
UploadArea should only preventDefault for Escape
...
This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.
2017-08-31 22:32:03 -05:00
Akihiko Odaki
69957ed10a
Fix the usages of Detect Passive Events ( #4749 )
2017-08-31 11:20:54 +02:00
Eugen Rochko
d1a78eba15
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
2017-08-31 03:38:35 +02:00
MitarashiDango
fec13735a7
error fixed (when loading pages in single column mode.) ( #4746 )
2017-08-30 17:30:25 +02:00
abcang
f59ed3a4fa
Scroll smoothly to the right ( #4735 )
2017-08-29 17:06:19 +02:00
MitarashiDango
7be620775e
fix error when single columns mode. ( #4734 )
2017-08-29 16:11:28 +02:00
Akihiko Odaki
9958eba356
Do not scroll the columns area due to redirection ( #4541 )
...
Commit 9d1f8b9d6a
2017-08-29 14:16:21 +02:00
Yamagishi Kazutoshi
fbe1115114
Remove eslint-disable comments ( #4681 )
...
Do not reject console.error and console.warn with ESLint rules.
2017-08-24 12:15:36 +02:00
Ondřej Hruška
820099813f
add scrollTop to ui/components/column ( #4563 )
2017-08-09 00:21:58 +02:00
Ondřej Hruška
61bfce5aa9
add missing @ to the onboarding modal ( #4560 )
2017-08-08 22:13:04 +02:00
Ondřej Hruška
cb42dd8497
Fix onboarding modal & add re-open button ( #129 )
...
* Added a button to open the onboarding modal
* Fixed onboarding modal
* added a show-me-around getting-started menu button
2017-08-08 21:42:29 +02:00
Ondřej Hruška
7a1ca8b0df
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
Sorin Davidoi
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
5942347407
Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc ( #4526 )
...
* Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop.
Also removed animate attribute from compose navigation bar, which should
have never been there. Added test for avatar overlay.
* fix broken tests
* god dammit another bug in tests! travis please let this pass
* formatting in avatar overlay
2017-08-07 19:44:55 +02:00
Ondřej Hruška
b6bf04ece2
Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column
2017-08-06 21:27:47 +02:00
Ondřej Hruška
811d895f7b
Merged upstream PR #4526
2017-08-06 21:23:36 +02:00
MitarashiDango
5ee45fa571
fix columns_area.js ( #4528 )
2017-08-05 20:33:41 +02:00
Akihiko Odaki
9d1f8b9d6a
Scroll columns area to right when children property is changed ( #4517 )
...
The feature to pin column could hide the rightmost column, which is
specified with children property of ColumnsArea.
The user is likely to see the column when the property changed, so scroll
the area in such cases.
2017-08-04 18:57:46 +02:00
kibigo!
8b58153583
Fixed onClick column links
2017-08-01 13:46:52 -07:00
kibigo!
8150689b48
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Sorin Davidoi
e44f03bc71
Improve accessibility (part 7) ( #4457 )
...
* fix(media_modal): Keyboard navigation
* fix(column_back_button): Use native button
* fix(media_gallery): Keyboard navigation
* fix(status_content): Make CW content focusable
2017-07-31 00:18:15 +02:00
Sorin Davidoi
4f04981dde
feat(tabs_bar): Avoid optimization for non-touch devices ( #4444 )
...
* fix(tabs_bar): Check if transition is necessary
* feat(tabs_bar): Only apply optimization for touch devices
2017-07-29 21:20:34 +02:00
みたらしだんご
a46ba4a8f5
fix tabs_bar.js ( #4436 )
2017-07-29 14:19:49 +02:00
