83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
fcf0d2078e
Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into merging-upstream
7 years ago
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
06e299cef5
Revert "autoscroll emoji suggestions box"
...
This reverts commit c89cce0219
7 years ago
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
7 years ago
b9f59ebcc6
Update Yarn to version 1.1.0 ( #5125 )
...
* Update Yarn to version 1.1.0
* remove hard-coding
7 years ago
e648ef0bfb
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
7 years ago
db3ed498b0
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.
7 years ago
901fc48aae
Upgrade Webpacker to version 3.0.1 ( #5122 )
7 years ago
3caf0ba923
Fix empty query sent to postgres for custom emojis ( #5121 )
7 years ago
6e83b5e719
Update brakeman to 3.0 and bundler-audit to 0.6 ( #5117 )
7 years ago
b32a1d5754
Refactor 500 file generation for future extension ( #5105 )
7 years ago
9d53a38a44
i18n: Update Polish translation ( #5106 )
...
* i18n: Update Polish translation
* i18n: Update Polish translation
7 years ago
f7ca205f38
Fixed webpack config code
7 years ago
86e617a839
Better themeing support!!
7 years ago
e528114c53
Follow-up to #4582 and #5027 , removing dead code ( #5101 )
7 years ago
cf7fbf2c56
Fix #5059 - Stop processing payload if it's from local account ( #5100 )
7 years ago
91e5b0dfdb
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
7 years ago
3b60832214
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
7 years ago
259181c41a
Fix size of single media in media-gallery ( #5098 )
7 years ago
510df0ac55
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.
7 years ago
98936bfcdf
Add missing validations in ActivityPub::Activity::Create ( #5096 )
7 years ago
5c82c2b75f
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.
7 years ago
0fea700c7b
Refresh manifest before generate 500.html ( #5090 )
7 years ago
2c8e3fbbfb
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
7 years ago
b982d549f4
Add strong_migrations gem to warn when creating unsafe migrations ( #5078 )
7 years ago
909a6d4661
Fix streaming API double-JSON-encoding status IDs for deletes ( #5069 )
7 years ago
3f3de38075
OC update: different emoji picker ( #5046 ) ( #5077 )
7 years ago
c267acfcf7
Thread toot notification mails by conversation ( #5061 )
...
* Thread toot notification mails by conversation
* Make codeclimate happy and avoid potential mis-threading
7 years ago
ab625c57ce
Compact status_ids in StatusRelationshipsPresenter ( #5073 )
7 years ago
e756c4f5ec
Fix media spoiler of DetailedStatus ( #5071 )
7 years ago
a0bbeafb04
Suppress backtrace when failed to communicate with a remote instance ( #5076 )
7 years ago
2f079573ed
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
7 years ago
b2820c3913
Forgotten in #5039 , change statuses_tags tag_id to bigint ( #5070 )
7 years ago
adc38078dd
Make sure nil IDs to not get cast to empty string in REST API ( #5068 )
7 years ago
dae0af1fd2
Change mobile layout breakpoint from 1024px to 630px ( #5063 )
...
630px = Drawer + 1 Column
7 years ago
5b8d0ad71b
Dropdown triangles a bit nicer, smoother scrolling on touch ( #5062 )
7 years ago
233258c61b
Fix media gallery CSS ( #5064 )
7 years ago
9c8aad612e
Require at least 2 characters before showing autosuggestions ( #5065 )
7 years ago
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
7 years ago
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
7 years ago
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.
7 years ago
6dfeb64326
jsx/zh-*: Fix "pin column" for Chinese ( #5060 )
7 years ago
427beb4177
i18n: Update Polish translation ( #5058 )
7 years ago
838f255fc2
Fix overflowing tabs in account__action-bar ( #5056 )
...
* Fix numbers in accounts columns
* Support edge compact-header
7 years ago
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
7 years ago
66126f3021
Add custom emojis to the emoji picker ( #5052 )
7 years ago
293972f716
New API: GET /api/v1/custom_emojis to get a server's custom emojis ( #5051 )
7 years ago
9c8e602163
Fix custom emojis not detected when used in content warning ( #5049 )
7 years ago
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
7 years ago
Ondřej Hruška
Yamagishi Kazutoshi
Eugen Rochko
nullkal
m4sk1n
kibigo!
Lynx Kotoura
Akihiko Odaki
unarist
JeanGauthier
ThibG
Daigo 3 Dango
abcang
Mingye Wang