about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-10-11Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-10-11Updating Dutch strings for 2.0 (#5334)Jeroen
2017-10-11Use gender neutral language as in the rest of the french translation (#5331)Alda Marteau-Hardi
2017-10-11Fix styles of error pages (#5335)Lynx Kotoura
Signed-off-by: Lynx Kotoura <admin@sanin.link> Signed-off-by: Lynx Kotoura <admin@sanin.link>
2017-10-11Removed length check which now happens in reducerkibigo!
2017-10-11Fixed header emojificationkibigo!
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-11fix presented og:url is incorrect (#5320)takayamaki
2017-10-11In thread view, only scroll first update, scroll to replied-to post (#5322)Eugen Rochko
2017-10-11Only preload JS in /web pages (#5325)Nolan Lawson
2017-10-11Fully disable hotkeys when input element is focused (#5324)Eugen Rochko
Because alt+n is a way to enter some kinda letter on some keyboard
2017-10-11Update french translation : mastodon/locales/fr.json (#5318)JohnD28
* Update fr.json * Update fr.json * Update fr.json
2017-10-11Update ar.json (#5316)ButterflyOfFire
Pushing new arabic translated strings for Mastodon web client.
2017-10-11Fix an error when ancestors get loaded before the status itself (#5312)unarist
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-11Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)Eugen Rochko
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-11sign_in and sign_up views present og meta infos (#5308)takayamaki
2017-10-10Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)Eugen Rochko
2017-10-10Fix custom emoji copy not copying file (#5298)Eugen Rochko
2017-10-10Fix #5295 - Order custom emoji lexicographically (#5297)Eugen Rochko
2017-10-10Fix an error when video playback buffer is empty (#5300)unarist
2017-10-10foreign_key, non-nullable, dependent: destroy in account_moderation_notes ↵nullkal
(#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-09Center error layout (#5289)Eugen Rochko
2017-10-09Fix pagination in Api::V1::BlocksController (#5285)Akihiko Odaki
2017-10-09try to tighten up local only toot stuff, like... properly (#163)beatrix
* try to tighten up local only toot stuff, like... properly * try to un-break tests
2017-10-09Fix dependency of error page generation on database (#5280)Eugen Rochko
2017-10-08Fix #5272 - Order of checks in ActivityPub handler (#5276)Eugen Rochko
2017-10-08Fix #5271 - Fix missing attribute in remove_from_feed (#5277)Eugen Rochko
Regression from #4801
2017-10-08Track frequently used emojis in web UI (#5275)Eugen Rochko
* 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-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
- 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-08Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)Eugen Rochko
2017-10-08improve static page metadata lookOndřej Hruška
2017-10-08i18n update Occitan (#5263)JeanGauthier
* Update oc.json * Update oc.yml * Update oc.yml * Update oc.json
2017-10-08Video preload should be a string (#5267)Nolan Lawson
2017-10-08Use ES module build of react-router-dom (#5264)Nolan Lawson
2017-10-08Dynamically calculate card height for embeds instead of padding (#5265)Eugen Rochko
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-08Show buffering in video player (#5261)Eugen Rochko
2017-10-07Merge pull request #161 from DJSundog/audio-uploads-featurebeatrix
Audio uploads feature
2017-10-07update indentationDJ Sundog
2017-10-07add faststart to audio transcodingDJ Sundog
2017-10-07adding support for audio uploads, transcoded to mp4 videosDJ Sundog
2017-10-07Add moderation note (#5240)nullkal
* Add moderation note * Add frozen_string_literal * Make rspec pass
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-10-07Fix custom emoji in emoji picker, persist skin tone (#5258)Eugen Rochko
2017-10-07In REST API, when URL can be missing, cast it to nil (#5259)Eugen Rochko
2017-10-08Japanese translation (relative time) (#5251)MitarashiDango
2017-10-07Encode custom emojis as resolveable objects in ActivityPub (#5243)Eugen Rochko
* Encode custom emojis as resolveable objects in ActivityPub * Improve code style
2017-10-07Update emoji-mart to v2.1.1 (#5256)Nolan Lawson
2017-10-07Fix regression from #5206 - deduplicate descendants (#5253)Eugen Rochko
2017-10-06Basic static metadata stylingkibigo!
2017-10-07Make auto-play GIFs preference affect custom emojis in web UI (#5254)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-10 02:50:32 +0000