]>
cat aescling's git repositories - mastodon.git/log
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
Ondřej Hruška [Sun, 8 Oct 2017 08:46:59 +0000 (10:46 +0200)]
improve static page metadata look
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
kibigo! [Sat, 7 Oct 2017 05:22:34 +0000 (22:22 -0700)]
Basic static metadata styling
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
Ondřej Hruška [Fri, 6 Oct 2017 07:23:28 +0000 (09:23 +0200)]
comment out unused stuff with Video
Ondřej Hruška [Fri, 6 Oct 2017 07:07:04 +0000 (09:07 +0200)]
fix haml quotes in a bid to make travis less grumpy
Ondřej Hruška [Thu, 5 Oct 2017 19:55:02 +0000 (21:55 +0200)]
workaround for notif clearing
beatrix [Sat, 30 Sep 2017 19:02:21 +0000 (15:02 -0400)]
Merge pull request #125 from glitch-soc/data-column
Add data-column="..." to all columns
beatrix [Sat, 30 Sep 2017 19:01:32 +0000 (15:01 -0400)]
Merge pull request #159 from glitch-soc/closed-instance-landing-page-login-form
add login form to landing page if regs are closed
Ondřej Hruška [Fri, 29 Sep 2017 14:41:18 +0000 (16:41 +0200)]
add login form to landing page if regs are closed
beatrix [Fri, 29 Sep 2017 01:48:28 +0000 (21:48 -0400)]
Merge pull request #157 from glitch-soc/merging-upstream
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
kibigo! [Fri, 29 Sep 2017 01:16:04 +0000 (18:16 -0700)]
HAML fix
kibigo! [Fri, 29 Sep 2017 00:45:16 +0000 (17:45 -0700)]
Fixed lingering upstream Theme code
kibigo! [Fri, 29 Sep 2017 00:18:12 +0000 (17:18 -0700)]
new HAML for statuses
Ondřej Hruška [Thu, 28 Sep 2017 09:13:37 +0000 (11:13 +0200)]
unbreak onboarding modal
Ondřej Hruška [Thu, 28 Sep 2017 09:03:23 +0000 (11:03 +0200)]
remove wrong emojify usage in old glitch components
Ondřej Hruška [Thu, 28 Sep 2017 08:13:16 +0000 (10:13 +0200)]
fix custom emoji not shown in statuses
Ondřej Hruška [Thu, 28 Sep 2017 08:04:20 +0000 (10:04 +0200)]
fix some js errors due to number->string change of status ID
Ondřej Hruška [Thu, 28 Sep 2017 07:20:59 +0000 (09:20 +0200)]
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
Ondřej Hruška [Thu, 28 Sep 2017 07:18:35 +0000 (09:18 +0200)]
Ondřej Hruška [Thu, 28 Sep 2017 07:12:47 +0000 (09:12 +0200)]
Skip-merge commit '
0401a24558294b6941c30c922af3f2063dfd305e ' into merging-upstream
Ondřej Hruška [Thu, 28 Sep 2017 07:12:17 +0000 (09:12 +0200)]
Ondřej Hruška [Thu, 28 Sep 2017 06:56:32 +0000 (08:56 +0200)]
Revert "autoscroll emoji suggestions box"
This reverts commit
c89cce0219646502b4d338213d112a528373bdc4 .
Ondřej Hruška [Thu, 28 Sep 2017 06:55:53 +0000 (08:55 +0200)]
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
This reverts commit
fa3587645da228e93767b245eeadbd668bc6cd38 , reversing
changes made to
15c9c2fd7e5603d48b5eeb966963138b454cfe2a .
Yamagishi Kazutoshi [Thu, 28 Sep 2017 02:51:36 +0000 (11:51 +0900)]
Update Yarn to version 1.1.0 (#5125)
* Update Yarn to version 1.1.0
* remove hard-coding
Eugen Rochko [Wed, 27 Sep 2017 22:26:33 +0000 (00:26 +0200)]
Remove web UI warnings about OStatus privacy (#5102)
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
Eugen Rochko [Wed, 27 Sep 2017 21:42:49 +0000 (23:42 +0200)]
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.
Yamagishi Kazutoshi [Wed, 27 Sep 2017 12:41:54 +0000 (21:41 +0900)]
Upgrade Webpacker to version 3.0.1 (#5122)
Eugen Rochko [Wed, 27 Sep 2017 02:14:03 +0000 (04:14 +0200)]
Fix empty query sent to postgres for custom emojis (#5121)
Eugen Rochko [Wed, 27 Sep 2017 01:13:09 +0000 (03:13 +0200)]
Update brakeman to 3.0 and bundler-audit to 0.6 (#5117)
nullkal [Tue, 26 Sep 2017 09:55:33 +0000 (18:55 +0900)]
Refactor 500 file generation for future extension (#5105)
m4sk1n [Tue, 26 Sep 2017 05:19:25 +0000 (07:19 +0200)]
i18n: Update Polish translation (#5106)
* i18n: Update Polish translation
* i18n: Update Polish translation
kibigo! [Tue, 26 Sep 2017 02:35:54 +0000 (19:35 -0700)]
Fixed webpack config code
kibigo! [Tue, 26 Sep 2017 02:24:32 +0000 (19:24 -0700)]
Better themeing support!!
Eugen Rochko [Mon, 25 Sep 2017 23:06:27 +0000 (01:06 +0200)]
Follow-up to #4582 and #5027, removing dead code (#5101)
Eugen Rochko [Mon, 25 Sep 2017 23:06:13 +0000 (01:06 +0200)]
Fix #5059 - Stop processing payload if it's from local account (#5100)
Eugen Rochko [Mon, 25 Sep 2017 22:29:29 +0000 (00:29 +0200)]
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
Eugen Rochko [Mon, 25 Sep 2017 21:05:54 +0000 (23:05 +0200)]
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
Lynx Kotoura [Mon, 25 Sep 2017 18:26:50 +0000 (03:26 +0900)]
Fix size of single media in media-gallery (#5098)
Eugen Rochko [Mon, 25 Sep 2017 16:36:33 +0000 (18:36 +0200)]
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.
Akihiko Odaki [Mon, 25 Sep 2017 16:33:11 +0000 (01:33 +0900)]
Add missing validations in ActivityPub::Activity::Create (#5096)
unarist [Mon, 25 Sep 2017 15:10:49 +0000 (00:10 +0900)]
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.
Yamagishi Kazutoshi [Mon, 25 Sep 2017 14:58:12 +0000 (23:58 +0900)]
Refresh manifest before generate 500.html (#5090)
Eugen Rochko [Mon, 25 Sep 2017 02:04:04 +0000 (04:04 +0200)]
Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
Eugen Rochko [Mon, 25 Sep 2017 00:11:14 +0000 (02:11 +0200)]
Add strong_migrations gem to warn when creating unsafe migrations (#5078)
Eugen Rochko [Sun, 24 Sep 2017 13:31:03 +0000 (15:31 +0200)]
Fix streaming API double-JSON-encoding status IDs for deletes (#5069)
JeanGauthier [Sun, 24 Sep 2017 10:17:47 +0000 (12:17 +0200)]
OC update: different emoji picker (#5046) (#5077)
ThibG [Sun, 24 Sep 2017 09:19:42 +0000 (11:19 +0200)]
Thread toot notification mails by conversation (#5061)
* Thread toot notification mails by conversation
* Make codeclimate happy and avoid potential mis-threading
Daigo 3 Dango [Sun, 24 Sep 2017 09:18:32 +0000 (23:18 -1000)]
Compact status_ids in StatusRelationshipsPresenter (#5073)
abcang [Sun, 24 Sep 2017 09:15:11 +0000 (18:15 +0900)]
Fix media spoiler of DetailedStatus (#5071)
Daigo 3 Dango [Sun, 24 Sep 2017 09:14:06 +0000 (23:14 -1000)]
Suppress backtrace when failed to communicate with a remote instance (#5076)
Eugen Rochko [Sun, 24 Sep 2017 03:58:30 +0000 (05:58 +0200)]
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
Eugen Rochko [Sun, 24 Sep 2017 03:58:07 +0000 (05:58 +0200)]
Forgotten in #5039, change statuses_tags tag_id to bigint (#5070)
Eugen Rochko [Sun, 24 Sep 2017 02:09:32 +0000 (04:09 +0200)]
Make sure nil IDs to not get cast to empty string in REST API (#5068)
Eugen Rochko [Sat, 23 Sep 2017 23:25:07 +0000 (01:25 +0200)]
Change mobile layout breakpoint from 1024px to 630px (#5063)
630px = Drawer + 1 Column
Eugen Rochko [Sat, 23 Sep 2017 22:40:10 +0000 (00:40 +0200)]
Dropdown triangles a bit nicer, smoother scrolling on touch (#5062)
Eugen Rochko [Sat, 23 Sep 2017 22:33:26 +0000 (00:33 +0200)]
Fix media gallery CSS (#5064)
Eugen Rochko [Sat, 23 Sep 2017 22:33:17 +0000 (00:33 +0200)]
Require at least 2 characters before showing autosuggestions (#5065)
Ondřej Hruška [Sat, 23 Sep 2017 21:41:25 +0000 (23:41 +0200)]
Fix intl warning with disabled secondary toot btn
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
Ondřej Hruška [Sat, 23 Sep 2017 21:38:24 +0000 (23:38 +0200)]
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
Ondřej Hruška [Sat, 23 Sep 2017 21:11:02 +0000 (23:11 +0200)]
Add secondary toot button (opt-in) (#153)
Add secondary toot button + other toot button enhancements.
Squashing so it's easy to revert if needed.
Mingye Wang [Sat, 23 Sep 2017 20:47:15 +0000 (16:47 -0400)]
jsx/zh-*: Fix "pin column" for Chinese (#5060)
m4sk1n [Sat, 23 Sep 2017 20:14:39 +0000 (22:14 +0200)]
i18n: Update Polish translation (#5058)
Lynx Kotoura [Sat, 23 Sep 2017 19:06:16 +0000 (04:06 +0900)]
Fix overflowing tabs in account__action-bar (#5056)
* Fix numbers in accounts columns
* Support edge compact-header
Eugen Rochko [Sat, 23 Sep 2017 12:47:32 +0000 (14:47 +0200)]
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
Eugen Rochko [Sat, 23 Sep 2017 03:40:28 +0000 (05:40 +0200)]
Add custom emojis to the emoji picker (#5052)
Eugen Rochko [Fri, 22 Sep 2017 23:57:23 +0000 (01:57 +0200)]
New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
Eugen Rochko [Fri, 22 Sep 2017 23:50:17 +0000 (01:50 +0200)]
Fix custom emojis not detected when used in content warning (#5049)
Eugen Rochko [Fri, 22 Sep 2017 23:41:00 +0000 (01:41 +0200)]
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
Ondřej Hruška [Fri, 22 Sep 2017 22:33:35 +0000 (00:33 +0200)]
Remove "extra clickable spaces" made obsolete by status re-design
Ondřej Hruška [Fri, 22 Sep 2017 19:47:14 +0000 (21:47 +0200)]
applied blackle's fix for gallery offset with full-width media
Akihiko Odaki [Fri, 22 Sep 2017 17:33:17 +0000 (02:33 +0900)]
Do not filter statuses with unknown languages (#5045)
nullkal [Fri, 22 Sep 2017 17:32:57 +0000 (02:32 +0900)]
Fix the migration error when deprecated_preview_cards has been deleted (#5043)
* Fix the migration error when deprecated_preview_cards has deleted
* Re-run Travis CI
Nolan Lawson [Fri, 22 Sep 2017 15:50:29 +0000 (08:50 -0700)]
Fix PropTypes.oneOfType() warning (#5041)
aschmitz [Fri, 22 Sep 2017 11:20:04 +0000 (06:20 -0500)]
Hardcode IdToBigints migration columns (#5039)
This addresses a comment during review:
https://github.com/tootsuite/mastodon/pull/4801#discussion_r139337452
This means we'll need to make sure that all _id columns going forward
are bigints, but that should happen automatically in most cases.
Nolan Lawson [Fri, 22 Sep 2017 04:44:39 +0000 (21:44 -0700)]
Document REDIS_NAMESPACE (#5038)
Eugen Rochko [Fri, 22 Sep 2017 02:59:17 +0000 (04:59 +0200)]
Make dropdowns render into portal, expand animation (#5018)
* Make dropdowns render into portal, expand animation
* Improve actions modal style
Nolan Lawson [Fri, 22 Sep 2017 02:59:01 +0000 (19:59 -0700)]
Use passive listener in privacy_dropdown.js (#5037)
Nolan Lawson [Fri, 22 Sep 2017 02:58:33 +0000 (19:58 -0700)]
Eliminate re-renders for intersection_observer_article.js (#5036)
kibigo! [Thu, 21 Sep 2017 23:55:32 +0000 (16:55 -0700)]
Long display names now ellipsis properly
kibigo! [Thu, 21 Sep 2017 23:43:01 +0000 (16:43 -0700)]
Styling fixes for header redesign
David Yip [Thu, 21 Sep 2017 21:11:03 +0000 (16:11 -0500)]
Merge pull request #148 from glitch-soc/better-header
Improvements to status headers and content
Ondřej Hruška [Thu, 21 Sep 2017 13:31:24 +0000 (15:31 +0200)]
autoscroll emoji suggestions box
syui [Thu, 21 Sep 2017 12:30:21 +0000 (21:30 +0900)]
fix : mobile style of /about/more (#5034)
beatrix [Thu, 21 Sep 2017 03:02:23 +0000 (23:02 -0400)]
Merge pull request #149 from glitch-soc/mojon-suggest
Emoji and Hashtag autocomplete
MIYAGI Hikaru [Thu, 21 Sep 2017 01:47:16 +0000 (01:47 +0000)]
Fix shortname problem in emojify() (regression from #5016) (#5032)
When colon appears end of line, skiped all character containing unicode emojis. Fixed.
https://github.com/tootsuite/mastodon/pull/5016#issuecomment-
331012008
kibigo! [Wed, 20 Sep 2017 21:51:45 +0000 (14:51 -0700)]
Fixed notification appearance
Ondřej Hruška [Wed, 20 Sep 2017 20:13:09 +0000 (22:13 +0200)]
fulltext mojo suggestions
Ondřej Hruška [Wed, 20 Sep 2017 19:57:33 +0000 (21:57 +0200)]
TURBO shortcode search
Ondřej Hruška [Wed, 20 Sep 2017 19:53:08 +0000 (21:53 +0200)]
add scrollbar to mojon suggestions list when too long
Ondřej Hruška [Wed, 20 Sep 2017 19:39:22 +0000 (21:39 +0200)]
cache allShortcodes
Ondřej Hruška [Wed, 20 Sep 2017 19:28:44 +0000 (21:28 +0200)]
typo in comment
Ondřej Hruška [Wed, 20 Sep 2017 18:34:11 +0000 (20:34 +0200)]
Appease Travis
Ondřej Hruška [Wed, 20 Sep 2017 18:21:09 +0000 (20:21 +0200)]
Emoji and Hashtag autocomplete
This page took 0.054077 seconds and 3 git commands to generate.