0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
6bc07d3de3
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
0352c40e99
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
07ea625cb2
Fix styles of error pages ( #5335 )
...
Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link>
2017-10-11 21:18:45 +02:00
3cc6255a7e
Removed length check which now happens in reducer
2017-10-11 11:50:11 -07:00
35e2cad4eb
Fixed header emojification
2017-10-11 11:00:28 -07:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
27101f1beb
fix presented og:url is incorrect ( #5320 )
2017-10-11 19:22:21 +02:00
1823cf435a
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
6a50329a9c
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
476e79b8e3
Fully disable hotkeys when input element is focused ( #5324 )
...
Because alt+n is a way to enter some kinda letter on some keyboard
2017-10-11 16:31:07 +02:00
19d3317a69
Update french translation : mastodon/locales/fr.json ( #5318 )
...
* Update fr.json
* Update fr.json
* Update fr.json
2017-10-11 22:07:09 +09:00
38600b2792
Update ar.json ( #5316 )
...
Pushing new arabic translated strings for Mastodon web client.
2017-10-11 21:19:04 +09:00
b0407ece42
Fix an error when ancestors get loaded before the status itself ( #5312 )
...
When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.
Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly.
2017-10-11 11:25:15 +02:00
b3d7ad958f
Fix #5306 : Stop hotkeys in input fields even when shift is pressed ( #5309 )
...
AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea
2017-10-11 01:01:17 +02:00
552d22bec9
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
9815be2a44
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
61d3ecc805
Fix custom emoji copy not copying file ( #5298 )
2017-10-10 15:18:27 +02:00
4bb3e4eeba
Fix #5295 - Order custom emoji lexicographically ( #5297 )
2017-10-10 15:18:12 +02:00
784c7510d7
Fix an error when video playback buffer is empty ( #5300 )
2017-10-10 15:17:53 +02:00
6c54d2e583
foreign_key, non-nullable, dependent: destroy in account_moderation_notes ( #5294 )
...
* Add foreign key constraint to column `account` in `account_moderation_notes`
* Change account_id and target_account_id to non-nullable in account_moderation_notes
* Add dependent: :destroy to account and target_account in account_moderation_notes
2017-10-10 13:12:17 +02:00
1c6fc0e4ce
Center error layout ( #5289 )
2017-10-09 20:51:36 +02:00
cc796298c9
Fix pagination in Api::V1::BlocksController ( #5285 )
2017-10-09 17:30:31 +02:00
f0a2a6c875
try to tighten up local only toot stuff, like... properly ( #163 )
...
* try to tighten up local only toot stuff, like... properly
* try to un-break tests
2017-10-09 09:56:17 -04:00
6e9e0c14e6
Fix dependency of error page generation on database ( #5280 )
2017-10-09 10:05:10 +02:00
3888a12c79
Fix #5272 - Order of checks in ActivityPub handler ( #5276 )
2017-10-08 22:03:34 +02:00
cfa68907ae
Fix #5271 - Fix missing attribute in remove_from_feed ( #5277 )
...
Regression from #4801
2017-10-08 21:55:34 +02:00
488584bfc1
Track frequently used emojis in web UI ( #5275 )
...
* Track frequently used emojis in web UI
* Persist emoji usage, but debounce commits to the settings API
* Fix #5144 - Add tooltips to picker
* Display only 2 lines of frequently used emojis
2017-10-08 21:47:15 +02:00
0717d9b3e6
Set snowflake IDs for backdated statuses ( #5260 )
...
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
2017-10-08 17:34:34 +02:00
6e4046fc3f
Fix #5178 - Use object URI only in Announce, instead of embedding ( #5266 )
2017-10-08 14:41:59 +02:00
92a3181dc6
improve static page metadata look
2017-10-08 10:46:59 +02:00
94f15338c3
i18n update Occitan ( #5263 )
...
* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json
2017-10-08 14:18:27 +09:00
db33a53ee8
Video preload should be a string ( #5267 )
2017-10-08 03:06:43 +02:00
7de6d269d2
Use ES module build of react-router-dom ( #5264 )
2017-10-08 02:55:58 +02:00
684001d729
Dynamically calculate card height for embeds instead of padding ( #5265 )
...
The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height
2017-10-08 02:34:49 +02:00
292f3cd7e0
Show buffering in video player ( #5261 )
2017-10-08 02:33:08 +02:00
7cc0da756d
Merge pull request #161 from DJSundog/audio-uploads-feature
...
Audio uploads feature
2017-10-07 20:13:53 -04:00
979b0d66a7
update indentation
2017-10-07 13:53:46 -07:00
6ca03a7f58
add faststart to audio transcoding
2017-10-07 19:59:22 +00:00
96ba3482b9
adding support for audio uploads, transcoded to mp4 videos
2017-10-07 19:54:10 +00:00
633426b261
Add moderation note ( #5240 )
...
* Add moderation note
* Add frozen_string_literal
* Make rspec pass
2017-10-07 20:26:43 +02:00
f486ef2666
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
d2dee6ea43
Fix custom emoji in emoji picker, persist skin tone ( #5258 )
2017-10-07 19:02:30 +02:00
967e70663f
In REST API, when URL can be missing, cast it to nil ( #5259 )
2017-10-07 18:55:48 +02:00
b7e65a004f
Japanese translation (relative time) ( #5251 )
2017-10-08 01:32:03 +09:00
3a3475450e
Encode custom emojis as resolveable objects in ActivityPub ( #5243 )
...
* Encode custom emojis as resolveable objects in ActivityPub
* Improve code style
2017-10-07 17:43:42 +02:00
057db0ecd0
Update emoji-mart to v2.1.1 ( #5256 )
2017-10-07 12:17:02 +02:00
11436358b4
Fix regression from #5206 - deduplicate descendants ( #5253 )
2017-10-07 12:16:39 +02:00
6610d57f91
Basic static metadata styling
2017-10-06 22:22:34 -07:00
45682f876d
Make auto-play GIFs preference affect custom emojis in web UI ( #5254 )
2017-10-07 02:38:52 +02:00
Ondřej Hruška
Jeroen
Alda Marteau-Hardi
Lynx Kotoura
kibigo!
takayamaki
Eugen Rochko
Nolan Lawson
JohnD28
ButterflyOfFire
unarist
nullkal
Akihiko Odaki
beatrix
JeanGauthier
DJ Sundog
DJ Sundog
MitarashiDango