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
210e6776fc
Fix intl warning with disabled secondary toot btn
...
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
2017-09-23 23:41:25 +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
31dd261375
applied blackle's fix for gallery offset with full-width media
2017-09-22 21:47:14 +02:00
a3760b7729
TURBO shortcode search
2017-09-20 21:57:33 +02:00
3783062450
Emoji and Hashtag autocomplete
2017-09-20 20:21:09 +02:00
6db034a866
Re-allow underscore on valid_url_path_ending_chars ( #4999 )
...
Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941 .
2017-09-18 21:25:40 +02:00
44245926f1
Fix cancellation of scroll to the right ( #4978 )
2017-09-17 11:59:23 +02:00
629fae8b3b
correct URL pattern used in text length counter in WebUI ( #4968 )
2017-09-16 15:01:15 +02:00
323d437a09
satisfy eslint
2017-09-13 21:47:30 -05:00
30b5254a5d
Put the label for the hide notifications checkbox in a label element.
2017-09-13 21:47:30 -05:00
0a207be99d
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
2ea9b164d3
Satisfy eslint.
2017-09-13 21:47:30 -05:00
b1576c52df
Convert profile header mute to use mute modal
2017-09-13 21:47:30 -05:00
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05: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
283a5ec1a4
fix share intent. ( #4926 )
2017-09-13 15:20:03 +02:00
60944d5dca
Fix height cache ( #4909 )
2017-09-13 10:24:33 +02:00
29c44fa5fa
Remove unused imports
2017-09-10 16:00:26 -05:00
932571fa22
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
72e662bb0d
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
2017-09-10 10:26:01 +02:00
f2cbfb2eb3
Fix dimensions of loading component for compose drawer ( #4872 )
2017-09-10 08:48:11 +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
14e1fb8d36
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -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
6867681c7c
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
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
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
334a633c2a
Fix a problem that notification column goes to top ( #4792 )
2017-09-03 20:31:51 +02:00
d3b6746173
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
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
15963a15c6
Disable embed modal when private status ( #4773 )
...
* Disable embed modal when private status
* Remove `reblogDisabled`
2017-09-02 14:01:44 +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
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
667df47168
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
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
69957ed10a
Fix the usages of Detect Passive Events ( #4749 )
2017-08-31 11:20:54 +02:00
d1a78eba15
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
2017-08-31 03:38:35 +02:00
fec13735a7
error fixed (when loading pages in single column mode.) ( #4746 )
2017-08-30 17:30:25 +02:00
f59ed3a4fa
Scroll smoothly to the right ( #4735 )
2017-08-29 17:06:19 +02:00
7be620775e
fix error when single columns mode. ( #4734 )
2017-08-29 16:11:28 +02:00
9958eba356
Do not scroll the columns area due to redirection ( #4541 )
...
Commit 9d1f8b9d6a
2017-08-29 14:16:21 +02:00
0827c09c44
Generalized the infinite scrollable list ( #4697 )
2017-08-28 22:23:44 +02:00
9caa90025f
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
2017-08-25 01:41:18 +02:00
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
ea958cae7f
Refactoring streaming connections ( #4645 )
2017-08-21 15:04:34 +02:00
23792f5a7c
Fix hasUnread on HashtagTimeline ( #4644 )
2017-08-20 17:12:06 +02:00
Ondřej Hruška