]>
cat aescling's git repositories - mastodon.git/log
David Yip [Mon, 16 Oct 2017 05:49:05 +0000 (00:49 -0500)]
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
Avatar unification, mk.II
Matthew Walsh [Sun, 18 Jun 2017 22:09:03 +0000 (15:09 -0700)]
1.6 changed files for unified avatar styling -- updated to restore unity
David Yip [Mon, 16 Oct 2017 01:04:19 +0000 (20:04 -0500)]
Merge pull request #173 from glitch-soc/zerowidthmoji
use zerowidth spaces with emojis
Ondřej Hruška [Sat, 14 Oct 2017 10:24:35 +0000 (12:24 +0200)]
Doodle improvements 2 (#176)
* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option>
Ondřej Hruška [Fri, 13 Oct 2017 22:58:38 +0000 (00:58 +0200)]
Doodle palette, options, fill tool (#172)
Ondřej Hruška [Fri, 13 Oct 2017 22:48:53 +0000 (00:48 +0200)]
use zerowidth spaces for emojis
David Yip [Fri, 13 Oct 2017 16:48:53 +0000 (11:48 -0500)]
Merge pull request #168 from glitch-soc/doodles
Initial doodle support
Ondřej Hruška [Fri, 13 Oct 2017 16:13:00 +0000 (18:13 +0200)]
Fixed a bug where the canvas would get transparent bg upon erase
Ondřej Hruška [Fri, 13 Oct 2017 16:01:14 +0000 (18:01 +0200)]
Initial doodle support
Ondřej Hruška [Thu, 12 Oct 2017 19:28:17 +0000 (21:28 +0200)]
Fix the notification bug with newlines
David Yip [Thu, 12 Oct 2017 14:36:26 +0000 (09:36 -0500)]
Another tabs-vs-spaces fix, but with ~feeling~
David Yip [Thu, 12 Oct 2017 14:23:06 +0000 (09:23 -0500)]
Fix tabs-vs-spaces issue pointed out by eslint.
David Yip [Thu, 12 Oct 2017 09:27:45 +0000 (04:27 -0500)]
Restore variable assignment in MuteService#call.
291feba6f113588cce4f06206754b31eba60044b made MuteService return the
result of Account#mute!; this commit restores that behavior.
David Yip [Thu, 12 Oct 2017 09:22:59 +0000 (04:22 -0500)]
Merge tag 'v2.0.0rc2' into gs-master
Eugen Rochko [Wed, 11 Oct 2017 22:58:14 +0000 (00:58 +0200)]
Change Android icon padding again to half of previous (#5339)
Sylvhem [Wed, 11 Oct 2017 22:58:01 +0000 (00:58 +0200)]
Fixes and updates for the French translation (#5340)
* Ajout du support des thèmes multiples
Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.
Add translations for the new strings allowing support for multiple themes.
* Mise à jour de la traduction
Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.
Update modified strings and add new translations for the ones who are missing them.
* Remplace « ' » par « ’ »
Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.
Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.
Ondřej Hruška [Wed, 11 Oct 2017 20:02:24 +0000 (22:02 +0200)]
Fix our media gallery not having alt text and tooltips
Ondřej Hruška [Wed, 11 Oct 2017 19:49:22 +0000 (21:49 +0200)]
workaround for scrollIntoView bug ???
Ondřej Hruška [Wed, 11 Oct 2017 19:34:00 +0000 (21:34 +0200)]
add duck beaks in haml
Ondřej Hruška [Wed, 11 Oct 2017 19:27:17 +0000 (21:27 +0200)]
Merge remote-tracking branch 'upstream/master'
Jeroen [Wed, 11 Oct 2017 19:21:22 +0000 (21:21 +0200)]
Updating Dutch strings for 2.0 (#5334)
Alda Marteau-Hardi [Wed, 11 Oct 2017 19:21:13 +0000 (21:21 +0200)]
Add myself as codeowner of the translation files. (#5333)
Alda Marteau-Hardi [Wed, 11 Oct 2017 19:20:56 +0000 (21:20 +0200)]
Use gender neutral language as in the rest of the french translation (#5331)
aschmitz [Wed, 11 Oct 2017 19:20:39 +0000 (14:20 -0500)]
Fix #5329 (#5332)
This fixes #5329, which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.
Lynx Kotoura [Wed, 11 Oct 2017 19:18:46 +0000 (04:18 +0900)]
Fix styles of error pages (#5335)
Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link>
kibigo! [Wed, 11 Oct 2017 18:50:11 +0000 (11:50 -0700)]
Removed length check which now happens in reducer
kibigo! [Wed, 11 Oct 2017 18:00:28 +0000 (11:00 -0700)]
Fixed header emojification
kibigo! [Wed, 11 Oct 2017 17:43:10 +0000 (10:43 -0700)]
Merge upstream 2.0ish #165
takayamaki [Wed, 11 Oct 2017 17:22:21 +0000 (02:22 +0900)]
fix presented og:url is incorrect (#5320)
Eugen Rochko [Wed, 11 Oct 2017 17:21:44 +0000 (19:21 +0200)]
In thread view, only scroll first update, scroll to replied-to post (#5322)
Nolan Lawson [Wed, 11 Oct 2017 17:20:55 +0000 (10:20 -0700)]
Only preload JS in /web pages (#5325)
Eugen Rochko [Wed, 11 Oct 2017 17:11:15 +0000 (19:11 +0200)]
Add padding to Android icon, change Apple and MS icons (#5321)
Eugen Rochko [Wed, 11 Oct 2017 14:31:07 +0000 (16:31 +0200)]
Fully disable hotkeys when input element is focused (#5324)
Because alt+n is a way to enter some kinda letter on some keyboard
JohnD28 [Wed, 11 Oct 2017 13:07:09 +0000 (15:07 +0200)]
Update french translation : mastodon/locales/fr.json (#5318)
* Update fr.json
* Update fr.json
* Update fr.json
JohnD28 [Wed, 11 Oct 2017 13:04:36 +0000 (15:04 +0200)]
Update doorkeeper.fr.yml (#5317)
ButterflyOfFire [Wed, 11 Oct 2017 12:19:04 +0000 (13:19 +0100)]
Update ar.json (#5316)
Pushing new arabic translated strings for Mastodon web client.
unarist [Wed, 11 Oct 2017 09:25:15 +0000 (18:25 +0900)]
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.
Eugen Rochko [Tue, 10 Oct 2017 23:33:29 +0000 (01:33 +0200)]
Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310)
Eugen Rochko [Tue, 10 Oct 2017 23:01:17 +0000 (01:01 +0200)]
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
takayamaki [Tue, 10 Oct 2017 22:52:25 +0000 (07:52 +0900)]
sign_in and sign_up views present og meta infos (#5308)
Eugen Rochko [Tue, 10 Oct 2017 18:48:26 +0000 (20:48 +0200)]
Bump version to 2.0.0rc2
Eugen Rochko [Tue, 10 Oct 2017 18:47:14 +0000 (20:47 +0200)]
Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)
Nolan Lawson [Tue, 10 Oct 2017 16:44:51 +0000 (09:44 -0700)]
Remove prop types from external libraries (#5304)
Jakob Kramer [Tue, 10 Oct 2017 14:12:18 +0000 (16:12 +0200)]
Update German translation (#5302)
Eugen Rochko [Tue, 10 Oct 2017 13:18:27 +0000 (15:18 +0200)]
Fix custom emoji copy not copying file (#5298)
Eugen Rochko [Tue, 10 Oct 2017 13:18:12 +0000 (15:18 +0200)]
Fix #5295 - Order custom emoji lexicographically (#5297)
unarist [Tue, 10 Oct 2017 13:17:53 +0000 (22:17 +0900)]
Fix an error when video playback buffer is empty (#5300)
nullkal [Tue, 10 Oct 2017 11:12:17 +0000 (20:12 +0900)]
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
Eugen Rochko [Tue, 10 Oct 2017 10:41:30 +0000 (12:41 +0200)]
Fix wrong dimensions on Android icon (#5296)
Eugen Rochko [Mon, 9 Oct 2017 19:27:16 +0000 (21:27 +0200)]
Material app icon for Chrome (#5291)
Eugen Rochko [Mon, 9 Oct 2017 18:52:40 +0000 (20:52 +0200)]
Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290)
Eugen Rochko [Mon, 9 Oct 2017 18:51:36 +0000 (20:51 +0200)]
Center error layout (#5289)
Eugen Rochko [Mon, 9 Oct 2017 18:51:24 +0000 (20:51 +0200)]
Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)
Jeong Arm [Mon, 9 Oct 2017 15:52:02 +0000 (00:52 +0900)]
Remove timestamps on any option (#5282)
Akihiko Odaki [Mon, 9 Oct 2017 15:30:31 +0000 (00:30 +0900)]
Fix pagination in Api::V1::BlocksController (#5285)
beatrix [Mon, 9 Oct 2017 13:56:17 +0000 (09:56 -0400)]
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
unarist [Mon, 9 Oct 2017 08:05:35 +0000 (17:05 +0900)]
Fix migration failure due to StrongMigrations on production env (#5283)
Eugen Rochko [Mon, 9 Oct 2017 08:05:10 +0000 (10:05 +0200)]
Fix dependency of error page generation on database (#5280)
Eugen Rochko [Sun, 8 Oct 2017 20:03:44 +0000 (22:03 +0200)]
Bump version to 2.0.0rc1 (#5209)
Eugen Rochko [Sun, 8 Oct 2017 20:03:34 +0000 (22:03 +0200)]
Fix #5272 - Order of checks in ActivityPub handler (#5276)
Eugen Rochko [Sun, 8 Oct 2017 19:55:34 +0000 (21:55 +0200)]
Fix #5271 - Fix missing attribute in remove_from_feed (#5277)
Regression from #4801
Eugen Rochko [Sun, 8 Oct 2017 19:47:15 +0000 (21:47 +0200)]
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
Eugen Rochko [Sun, 8 Oct 2017 15:34:34 +0000 (17:34 +0200)]
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
Eugen Rochko [Sun, 8 Oct 2017 12:41:59 +0000 (14:41 +0200)]
Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)
Ondřej Hruška [Sun, 8 Oct 2017 08:46:59 +0000 (10:46 +0200)]
improve static page metadata look
m4sk1n [Sun, 8 Oct 2017 07:00:55 +0000 (09:00 +0200)]
i18n: Update Polish translation (#5270)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Jeong Arm [Sun, 8 Oct 2017 05:30:14 +0000 (14:30 +0900)]
Translate some Esperanto (#5252)
* Translate some Esperanto
* More translation
* More Esperanto translation
* Esperanto translation
* Fix mistaken format
JeanGauthier [Sun, 8 Oct 2017 05:18:27 +0000 (07:18 +0200)]
i18n update Occitan (#5263)
* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json
Nolan Lawson [Sun, 8 Oct 2017 01:06:43 +0000 (18:06 -0700)]
Video preload should be a string (#5267)
Nolan Lawson [Sun, 8 Oct 2017 00:55:58 +0000 (17:55 -0700)]
Use ES module build of react-router-dom (#5264)
Eugen Rochko [Sun, 8 Oct 2017 00:34:49 +0000 (02:34 +0200)]
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
Eugen Rochko [Sun, 8 Oct 2017 00:33:08 +0000 (02:33 +0200)]
Show buffering in video player (#5261)
beatrix [Sun, 8 Oct 2017 00:13:53 +0000 (20:13 -0400)]
Merge pull request #161 from DJSundog/audio-uploads-feature
Audio uploads feature
DJ Sundog [Sat, 7 Oct 2017 23:14:34 +0000 (16:14 -0700)]
raise Mastodon::ValidationError if audio file duration is over 60 secs
DJ Sundog [Sat, 7 Oct 2017 20:55:11 +0000 (13:55 -0700)]
update indentation
DJ Sundog [Sat, 7 Oct 2017 20:53:46 +0000 (13:53 -0700)]
update indentation
DJ Sundog [Sat, 7 Oct 2017 19:59:22 +0000 (19:59 +0000)]
add faststart to audio transcoding
DJ Sundog [Sat, 7 Oct 2017 19:54:10 +0000 (19:54 +0000)]
adding support for audio uploads, transcoded to mp4 videos
Eugen Rochko [Sat, 7 Oct 2017 19:20:59 +0000 (21:20 +0200)]
Update outdated README (#5262)
nullkal [Sat, 7 Oct 2017 18:26:43 +0000 (03:26 +0900)]
Add moderation note (#5240)
* Add moderation note
* Add frozen_string_literal
* Make rspec pass
Eugen Rochko [Sat, 7 Oct 2017 18:00:35 +0000 (20:00 +0200)]
Redesign public hashtag pages (#5237)
Eugen Rochko [Sat, 7 Oct 2017 17:02:30 +0000 (19:02 +0200)]
Fix custom emoji in emoji picker, persist skin tone (#5258)
Eugen Rochko [Sat, 7 Oct 2017 16:55:48 +0000 (18:55 +0200)]
In REST API, when URL can be missing, cast it to nil (#5259)
MitarashiDango [Sat, 7 Oct 2017 16:32:03 +0000 (01:32 +0900)]
Japanese translation (relative time) (#5251)
Eugen Rochko [Sat, 7 Oct 2017 15:43:42 +0000 (17:43 +0200)]
Encode custom emojis as resolveable objects in ActivityPub (#5243)
* Encode custom emojis as resolveable objects in ActivityPub
* Improve code style
Nolan Lawson [Sat, 7 Oct 2017 10:17:02 +0000 (03:17 -0700)]
Update emoji-mart to v2.1.1 (#5256)
Eugen Rochko [Sat, 7 Oct 2017 10:16:39 +0000 (12:16 +0200)]
Fix regression from #5206 - deduplicate descendants (#5253)
kibigo! [Sat, 7 Oct 2017 05:22:34 +0000 (22:22 -0700)]
Basic static metadata styling
Jeong Arm [Sat, 7 Oct 2017 05:16:59 +0000 (14:16 +0900)]
Korean translation (#5244)
* [i18n] Korean translation
Add missing Korean translations.
[skip ci]
* start ci
Eugen Rochko [Sat, 7 Oct 2017 00:38:52 +0000 (02:38 +0200)]
Make auto-play GIFs preference affect custom emojis in web UI (#5254)
m4sk1n [Fri, 6 Oct 2017 20:43:32 +0000 (22:43 +0200)]
i18n: Update Polish translation (#5255)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Lynx Kotoura [Fri, 6 Oct 2017 18:40:17 +0000 (03:40 +0900)]
Fix overflowing in web UI (#5246)
* Fix overflowing in web UI
* Revert fixing dropdown menu modal
unarist [Fri, 6 Oct 2017 18:39:08 +0000 (03:39 +0900)]
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
unarist [Fri, 6 Oct 2017 18:38:29 +0000 (03:38 +0900)]
Fix remote profile being displayed in HTML on remote_follow (#5249)
K.SHIRAKASHI [Fri, 6 Oct 2017 18:37:56 +0000 (03:37 +0900)]
Fix error on reloading status detail column (#5248)
unarist [Fri, 6 Oct 2017 18:37:17 +0000 (03:37 +0900)]
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.
MIYAGI Hikaru [Fri, 6 Oct 2017 14:40:41 +0000 (14:40 +0000)]
Fix error at emoji_compressed in Firefox ESR (#5241)
Lynx Kotoura [Fri, 6 Oct 2017 11:29:53 +0000 (20:29 +0900)]
Fix theme settings (#5242)
Nolan Lawson [Fri, 6 Oct 2017 10:03:13 +0000 (03:03 -0700)]
Fix thinking_face emoji autocomplete (#5238)
Ondřej Hruška [Fri, 6 Oct 2017 07:34:12 +0000 (09:34 +0200)]
Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing
workaround for notif clearing
This page took 0.069653 seconds and 3 git commands to generate.