Surinna Curtis
5774861ece
satisfy eslint
2017-09-13 21:47:30 -05:00
Surinna Curtis
27ee70ba19
Put the label for the hide notifications checkbox in a label element.
2017-09-13 21:47:30 -05:00
Surinna Curtis
b7227d05f8
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
Surinna Curtis
9cdcd429d9
Satisfy eslint.
2017-09-13 21:47:30 -05:00
Surinna Curtis
62fde4c01c
Convert profile header mute to use mute modal
2017-09-13 21:47:30 -05:00
Surinna Curtis
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
Surinna Curtis
485de6b477
Remove unused imports
2017-09-10 16:00:26 -05:00
David Yip
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
Eugen Rochko
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
2017-09-10 10:26:01 +02:00
Eugen Rochko
63cb303a66
Fix dimensions of loading component for compose drawer ( #4872 )
2017-09-10 08:48:11 +02:00
David Yip
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
2017-09-09 23:56:21 -05:00
David Yip
bee4cdc8d2
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -05:00
David Yip
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
David Yip
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
2017-09-09 14:27:47 -05:00
Eugen Rochko
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
voidSatisfaction
d766cb0c3c
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
voidSatisfaction
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
2017-09-06 17:32:15 +02:00
abcang
2434169c90
Fix a problem that notification column goes to top ( #4792 )
2017-09-03 20:31:51 +02:00
Eugen Rochko
23682c8593
Make "unfollow" undo pending outgoing follow request too ( #4781 )
...
* Make "unfollow" undo pending outgoing follow request too
* Add cancel button to web UI when awaiting follow request approval
* Make the hourglass button do the cancelling
2017-09-02 20:44:41 +02:00
Surinna Curtis
ed0798ec18
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
3a21f6f4c4
Disable embed modal when private status ( #4773 )
...
* Disable embed modal when private status
* Remove `reblogDisabled`
2017-09-02 14:01:44 +02:00
Eugen Rochko
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
2017-09-01 16:20:16 +02:00
Yamagishi Kazutoshi
8d4e705cb0
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
192f74a9c5
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-08-31 22:41:49 -05:00
Surinna Curtis
8f2170d9cd
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
3b8a64e94e
Fix the usages of Detect Passive Events ( #4749 )
2017-08-31 11:20:54 +02:00
Eugen Rochko
ad769409f7
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
2017-08-31 03:38:35 +02:00
MitarashiDango
a7400f8016
error fixed (when loading pages in single column mode.) ( #4746 )
2017-08-30 17:30:25 +02:00
abcang
e8e6bb5437
Scroll smoothly to the right ( #4735 )
2017-08-29 17:06:19 +02:00
MitarashiDango
5a1614ce9b
fix error when single columns mode. ( #4734 )
2017-08-29 16:11:28 +02:00
Akihiko Odaki
46142a58d2
Do not scroll the columns area due to redirection ( #4541 )
...
Commit c4a21aa352
2017-08-29 14:16:21 +02:00
abcang
4ce06cc0c9
Generalized the infinite scrollable list ( #4697 )
2017-08-28 22:23:44 +02:00
Eugen Rochko
3e20cb7025
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
2017-08-25 01:41:18 +02:00
Yamagishi Kazutoshi
cd9586122d
Remove eslint-disable comments ( #4681 )
...
Do not reject console.error and console.warn with ESLint rules.
2017-08-24 12:15:36 +02:00
abcang
8a4ac3f71c
Refactoring streaming connections ( #4645 )
2017-08-21 15:04:34 +02:00
abcang
614ba8542c
Fix hasUnread on HashtagTimeline ( #4644 )
2017-08-20 17:12:06 +02:00
Eugen Rochko
0e5c8372e7
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
2017-08-14 04:53:31 +02:00
Ondřej Hruška
df045a98e1
add scrollTop to ui/components/column ( #4563 )
2017-08-09 00:21:58 +02:00
Ondřej Hruška
bcab356f3d
add missing @ to the onboarding modal ( #4560 )
2017-08-08 22:13:04 +02:00
Ondřej Hruška
bb1262f392
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
913dd13575
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
Sorin Davidoi
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
2017-08-07 20:32:03 +02:00
Ondřej Hruška
199affb141
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
e11cd9b141
Merged upstream PR #4526
2017-08-06 21:23:36 +02:00
MitarashiDango
ad1065cbc5
fix columns_area.js ( #4528 )
2017-08-05 20:33:41 +02:00
Akihiko Odaki
c4a21aa352
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!
aa6e24bf44
Fixed onClick column links
2017-08-01 13:46:52 -07:00
kibigo!
2cdee6ae8a
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Eugen Rochko
7ccb3a9d77
Simplify web UI character counter logic ( #4463 )
2017-07-31 15:19:48 +02:00
Yamagishi Kazutoshi
5be327104f
Disable sensitive button when with content warnings ( #4460 )
2017-07-31 05:06:56 +02:00
