0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
2017-09-28 09:18:35 +02:00
2ae4f48a48
Skip-merge commit 'b4842ef0b90be08414b57ac9f1cfae87f631ed58' into merging-upstream
2017-09-28 09:12:47 +02:00
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
ca2fd3c8a2
Revert "autoscroll emoji suggestions box"
...
This reverts commit 640740eeac
2017-09-28 08:56:32 +02:00
3398d0e84c
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit b14d2a5ae641832d083e
2017-09-28 08:55:53 +02:00
9ab3021562
Update Yarn to version 1.1.0 ( #5125 )
...
* Update Yarn to version 1.1.0
* remove hard-coding
2017-09-28 04:51:36 +02:00
a2a189819e
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
2017-09-28 00:26:33 +02:00
7031e350b3
When OAuth password verification fails, return 401 instead of redirect ( #5111 )
...
Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.
2017-09-27 23:42:49 +02:00
12b7306a03
Upgrade Webpacker to version 3.0.1 ( #5122 )
2017-09-27 14:41:54 +02:00
e8871341bf
Fix empty query sent to postgres for custom emojis ( #5121 )
2017-09-27 04:14:03 +02:00
a90aac6953
Update brakeman to 3.0 and bundler-audit to 0.6 ( #5117 )
2017-09-27 03:13:09 +02:00
463bbe870f
Refactor 500 file generation for future extension ( #5105 )
2017-09-26 11:55:33 +02:00
7291f1de08
i18n: Update Polish translation ( #5106 )
...
* i18n: Update Polish translation
* i18n: Update Polish translation
2017-09-26 14:19:25 +09:00
10a2b3dd4c
Follow-up to #4582 and #5027 , removing dead code ( #5101 )
2017-09-26 01:06:27 +02:00
1efe904a28
Fix #5059 - Stop processing payload if it's from local account ( #5100 )
2017-09-26 01:06:13 +02:00
25d6a51276
Send streaming API delete to people mentioned in status ( #5103 )
...
- Previously they wouldn't receive it unless they were author's
followers
- Skip unpush from public/hashtag timelines if status wasn't
public in the first place
2017-09-26 00:29:29 +02:00
1767f9817c
New error page graphic. Other error page improvements ( #5099 )
...
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
not user's fault
2017-09-25 23:05:54 +02:00
cad208ba43
Fix size of single media in media-gallery ( #5098 )
2017-09-25 20:26:50 +02:00
8b7c639bbe
Fix emojify() by generating a mapping to existing Twemoji files ( #5080 )
...
A new rake task emojis:generate downloads a full list of valid
unicode sequences from unicode.org and checks it against existing
Twemoji files, finally generating a map from each sequence to the
existing file (e.g. when there's multiple ways an emoji can be
expressed). The map is dumped into app/javascript/mastodon/emoji_map.json
That file is loaded by emojione_light.js (now a misnomer) which
decorates it further with shortcodes taken from emoji-mart's index.
2017-09-25 18:36:33 +02:00
77424c156d
Add missing validations in ActivityPub::Activity::Create ( #5096 )
2017-09-25 18:33:11 +02:00
df27f599d2
Increase max height of preview card image ( #5092 )
...
We added horizontal layout to preview card for wide image. However, max height of the thumbnail is still limited to 120px and it makes nearly square images to too small for that layout.
This PR increases max height as well as max width.
2017-09-25 17:10:49 +02:00
5391b6d44d
Refresh manifest before generate 500.html ( #5090 )
2017-09-25 16:58:12 +02:00
6b0ea1e79c
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
65827bd2b4
Add strong_migrations gem to warn when creating unsafe migrations ( #5078 )
2017-09-25 02:11:14 +02:00
6d12bcb225
Fix streaming API double-JSON-encoding status IDs for deletes ( #5069 )
2017-09-24 15:31:03 +02:00
91fa75997a
OC update: different emoji picker ( #5046 ) ( #5077 )
2017-09-24 12:17:47 +02:00
2338b5954c
Thread toot notification mails by conversation ( #5061 )
...
* Thread toot notification mails by conversation
* Make codeclimate happy and avoid potential mis-threading
2017-09-24 11:19:42 +02:00
7e6322863c
Compact status_ids in StatusRelationshipsPresenter ( #5073 )
2017-09-24 11:18:32 +02:00
9cdd517849
Fix media spoiler of DetailedStatus ( #5071 )
2017-09-24 11:15:11 +02:00
e7624bfaae
Suppress backtrace when failed to communicate with a remote instance ( #5076 )
2017-09-24 11:14:06 +02:00
9ad1bfbc18
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
2e342947ce
Forgotten in #5039 , change statuses_tags tag_id to bigint ( #5070 )
2017-09-24 05:58:07 +02:00
40399df3e4
Make sure nil IDs to not get cast to empty string in REST API ( #5068 )
2017-09-24 04:09:32 +02:00
ba676acb6e
Change mobile layout breakpoint from 1024px to 630px ( #5063 )
...
630px = Drawer + 1 Column
2017-09-24 01:25:07 +02:00
6a42ddd01c
Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )
2017-09-24 00:40:10 +02:00
b8a3a45da1
Fix media gallery CSS ( #5064 )
2017-09-24 00:33:26 +02:00
0468f86a8b
Require at least 2 characters before showing autosuggestions ( #5065 )
2017-09-24 00:33:17 +02:00
b8019a2a46
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
3b79104d29
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
b65e03fd0f
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
213b828014
jsx/zh-*: Fix "pin column" for Chinese ( #5060 )
2017-09-23 22:47:15 +02:00
6cf48c427b
i18n: Update Polish translation ( #5058 )
2017-09-23 22:14:39 +02:00
2063f622df
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
da257754b5
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
4a0212bf2f
Add custom emojis to the emoji picker ( #5052 )
2017-09-23 05:40:28 +02:00
f621e05356
New API: GET /api/v1/custom_emojis to get a server's custom emojis ( #5051 )
2017-09-23 01:57:23 +02:00
d2aeb45461
Fix custom emojis not detected when used in content warning ( #5049 )
2017-09-23 01:50:17 +02:00
16a5d1450c
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
ba7fbb92a7
Remove "extra clickable spaces" made obsolete by status re-design
2017-09-23 00:33:35 +02:00
1325ec8b1d
applied blackle's fix for gallery offset with full-width media
2017-09-22 21:47:14 +02:00
Ondřej Hruška