fa3587645d
Merge pull request #149 from glitch-soc/mojon-suggest
...
Emoji and Hashtag autocomplete
2017-09-20 23:02:23 -04:00
514edd3c23
fulltext mojo suggestions
2017-09-20 22:13:09 +02:00
a3760b7729
TURBO shortcode search
2017-09-20 21:57:33 +02:00
cbf00168f1
add scrollbar to mojon suggestions list when too long
2017-09-20 21:53:08 +02:00
4f9a493d9d
cache allShortcodes
2017-09-20 21:39:22 +02:00
8c0733a14e
typo in comment
2017-09-20 21:28:44 +02:00
3783062450
Emoji and Hashtag autocomplete
2017-09-20 20:21:09 +02:00
15c9c2fd7e
Pinned toots; embeds
2017-09-20 02:50:53 -07:00
227dbb6adb
Added GIF hover-to-play support
2017-09-20 02:19:36 -07:00
003bfd094e
Fixed disabled boost SVG ( #106 )
2017-09-20 00:40:54 -07:00
fae8dce738
Fixed #133 (only parse links in status text)
2017-09-20 00:20:11 -07: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
59936b7a98
Tweak title text for mute notifications toggle to be clearer
2017-09-13 22:54:14 -05:00
4a527154b7
fix a missing import
2017-09-13 21:47:30 -05:00
df71eadaae
In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
2017-09-13 21:47:30 -05:00
323d437a09
satisfy eslint
2017-09-13 21:47:30 -05:00
3278c08c29
make the hide/unhide notifications buttons work
2017-09-13 21:47:30 -05:00
0e0703dbd8
Show whether muted users' notifications are muted in account lists
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
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
bdc8b4fd91
Disable mouse-based pause from #4859 ( #4865 )
...
It wasn't working ideally and introduced some annoying false positivies
2017-09-09 15:09:50 +02:00
c7908e2d09
Fix scroll behavior and others on paused timeline ( #4864 )
...
Resolved:
* Lot of redundant renders while mouse moving
* Scroll jumping when timeline loaded
* Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived
Unresolved:
* Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived
-> It needs to know which statuses are over the scrollTop
* New status indicator should be active when new statuses arrived while mouse moved recently
-> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving
2017-09-09 14:16:11 +02:00
c9d04f1c39
Fix second report (regression from 3b81baaaaf) ( #4863 )
2017-09-09 13:42:48 +02:00
3c45d3963a
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
2017-09-09 02:26:58 +02:00
baa8b82179
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ( #4859 )
2017-09-09 02:26:41 +02:00
1ae5d49a71
Refresh timeline after toot while the timeline is disconnected ( #4858 )
...
To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views.
After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.
2017-09-08 21:43:34 +02:00
dabc309ca3
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
2017-09-08 13:55:47 +02:00
95f018a3d4
"Mute conversation" option on all own toots, not just in notifications ( #4844 )
...
That way you can mute notifications for a toot before you get replies
to it or boosts or favourites
2017-09-08 12:00:30 +02:00
7c2d84910c
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in >
2017-09-08 05:51:48 +09:00
b00cc4b9bd
i10n OC / FR update Pinned toots ( #4842 )
...
* Added column.pins
New strings
* Added column.pins
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update password_change.oc.html.erb
* Update password_change.oc.text.erb
* Update reset_password_instructions.oc.html.erb
* Update reset_password_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
2017-09-07 22:07:03 +02:00
7d853b514a
Use <button> instead of <div role="button"> ( #4835 )
2017-09-07 16:18:41 +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
be75b13d68
i10n update OC and FR files ( #4824 )
...
* Onboarding: corrections
Some missing letters and spaces or better wording
* Embed
Translated as Intégrer in FR / Embarcar in OC
2017-09-07 08:55:03 +09:00
9417c9bb8f
Update fr.json ( #4830 )
...
typo
2017-09-06 22:32:49 +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
aec5097d44
i18n: update Persian translation ( #4822 )
2017-09-06 17:31:54 +02:00
1646f622a5
fix scroll position ( #4821 )
2017-09-06 17:29:56 +02:00
