fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 11:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
4764 commits 129 branches 266 tags 981 MiB
Commit graph

4764 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
beatrix 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
unarist 7fd66cf2fe Fix migration failure due to StrongMigrations on production env (#5283) 2017-10-09 10:05:35 +02:00
Eugen Rochko 6e9e0c14e6 Fix dependency of error page generation on database (#5280) 2017-10-09 10:05:10 +02:00
Eugen Rochko 0aa810f9c8 Bump version to 2.0.0rc1 (#5209) 2017-10-08 22:03:44 +02:00
Eugen Rochko 3888a12c79 Fix #5272 - Order of checks in ActivityPub handler (#5276) 2017-10-08 22:03:34 +02:00
Eugen Rochko cfa68907ae Fix #5271 - Fix missing attribute in remove_from_feed (#5277) 
Regression from #4801
 2017-10-08 21:55:34 +02:00
Eugen Rochko 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
Eugen Rochko 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
Eugen Rochko 6e4046fc3f Fix #5178 - Use object URI only in Announce, instead of embedding (#5266) 2017-10-08 14:41:59 +02:00
Ondřej Hruška 92a3181dc6
improve static page metadata look 2017-10-08 10:46:59 +02:00
m4sk1n f0c939c431 i18n: Update Polish translation (#5270) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-08 16:00:55 +09:00
Jeong Arm ebadfe0ab7 Translate some Esperanto (#5252) 
* Translate some Esperanto

* More translation

* More Esperanto translation

* Esperanto translation

* Fix mistaken format
 2017-10-08 14:30:14 +09:00
JeanGauthier 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
Nolan Lawson db33a53ee8 Video preload should be a string (#5267) 2017-10-08 03:06:43 +02:00
Nolan Lawson 7de6d269d2 Use ES module build of react-router-dom (#5264) 2017-10-08 02:55:58 +02:00
Eugen Rochko 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
Eugen Rochko 292f3cd7e0 Show buffering in video player (#5261) 2017-10-08 02:33:08 +02:00
beatrix 7cc0da756d Merge pull request #161 from DJSundog/audio-uploads-feature 
Audio uploads feature
 2017-10-07 20:13:53 -04:00
DJ Sundog 85d5da86df raise Mastodon::ValidationError if audio file duration is over 60 secs 2017-10-07 16:14:34 -07:00
DJ Sundog e10cff8226 update indentation 2017-10-07 13:55:11 -07:00
DJ Sundog 979b0d66a7 update indentation 2017-10-07 13:53:46 -07:00
DJ Sundog 6ca03a7f58 add faststart to audio transcoding 2017-10-07 19:59:22 +00:00
DJ Sundog 96ba3482b9 adding support for audio uploads, transcoded to mp4 videos 2017-10-07 19:54:10 +00:00
Eugen Rochko a3d4f1bd93 Update outdated README (#5262) 2017-10-07 21:20:59 +02:00
nullkal 633426b261 Add moderation note (#5240) 
* Add moderation note

* Add frozen_string_literal

* Make rspec pass
 2017-10-07 20:26:43 +02:00
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00
Eugen Rochko d2dee6ea43 Fix custom emoji in emoji picker, persist skin tone (#5258) 2017-10-07 19:02:30 +02:00
Eugen Rochko 967e70663f In REST API, when URL can be missing, cast it to nil (#5259) 2017-10-07 18:55:48 +02:00
MitarashiDango b7e65a004f Japanese translation (relative time) (#5251) 2017-10-08 01:32:03 +09:00
Eugen Rochko 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
Nolan Lawson 057db0ecd0 Update emoji-mart to v2.1.1 (#5256) 2017-10-07 12:17:02 +02:00
Eugen Rochko 11436358b4 Fix regression from #5206 - deduplicate descendants (#5253) 2017-10-07 12:16:39 +02:00
kibigo! 6610d57f91 Basic static metadata styling 2017-10-06 22:22:34 -07:00
Jeong Arm 0e0a9e716c Korean translation (#5244) 
* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci
 2017-10-07 14:16:59 +09:00
Eugen Rochko 45682f876d Make auto-play GIFs preference affect custom emojis in web UI (#5254) 2017-10-07 02:38:52 +02:00
m4sk1n 4413d81d7f i18n: Update Polish translation (#5255) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-10-06 22:43:32 +02:00
Lynx Kotoura 5a2c7bd4ce Fix overflowing in web UI (#5246) 
* Fix overflowing in web UI

* Revert fixing dropdown menu modal
 2017-10-06 20:40:17 +02:00
unarist 5c8ca024ef Improve error handling on LinkCrawlWorker (#5250) 
* Improve error handling on LinkCrawlWorker

* Ignore TimeoutError and InvalidURIError too
* Record errors to debug log
* Enable dead job queue on LinkCrawlWorker

Since most of acceptable errors were already ignored, only our side issue should go to dead job queue.

* Ignore all http gem errors
 2017-10-06 20:39:08 +02:00
unarist d8b2f89d33 Fix remote profile being displayed in HTML on remote_follow (#5249) 2017-10-06 20:38:29 +02:00
K.SHIRAKASHI d5f490b1a2 Fix error on reloading status detail column (#5248) 2017-10-06 20:37:56 +02:00
unarist c75ca0525b Specify middleware versions in docker-compose.yml (#5247) 
PostgreSQL10 has been released, but upgrading from older versions needs dump/restore. If you pull new version without those handling, db service will fail to launch.

To prevent accidentally upgrading, and as a recommended version, this patch specifies PostgreSQL and Redis version.
 2017-10-06 20:37:17 +02:00
MIYAGI Hikaru 6f2d88dd28 Fix error at emoji_compressed in Firefox ESR (#5241) 2017-10-06 16:40:41 +02:00
Lynx Kotoura daa59dd454 Fix theme settings (#5242) 2017-10-06 13:29:53 +02:00
Nolan Lawson 72d939b69f Fix thinking_face emoji autocomplete (#5238) 2017-10-06 12:03:13 +02:00
Ondřej Hruška 1a8011648f Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing 
workaround for notif clearing
 2017-10-06 09:34:12 +02:00
Ondřej Hruška 37e141bccb
comment out unused stuff with Video 2017-10-06 09:23:28 +02:00
Ondřej Hruška dcd8ff5308
fix haml quotes in a bid to make travis less grumpy 2017-10-06 09:07:04 +02:00
Nolan Lawson 97b3d0cd56 Import only Spring/Motion from react-motion (#5236) 2017-10-06 03:46:15 +02:00
Nolan Lawson fd7f0732fe Compress and combine emoji data (#5229) 2017-10-06 03:42:34 +02:00
Eugen Rochko eb5ac23434 Clean up code style of Mastodon::TimestampId module (#5232) 
* Clean up code style of Mastodon::TimestampId module

* Update brakeman config
 2017-10-06 03:42:21 +02:00