]>
cat aescling's git repositories - mastodon.git/log
kibigo! [Wed, 20 Sep 2017 08:57:08 +0000 (01:57 -0700)]
Improvements to status headers
kibigo! [Wed, 20 Sep 2017 07:40:54 +0000 (00:40 -0700)]
Fixed disabled boost SVG (#106)
kibigo! [Wed, 20 Sep 2017 07:20:11 +0000 (00:20 -0700)]
Fixed #133 (only parse links in status text)
Surinna Curtis [Sat, 16 Sep 2017 16:44:17 +0000 (11:44 -0500)]
Re-center hidden media text vertical
David Yip [Sat, 16 Sep 2017 16:37:53 +0000 (11:37 -0500)]
Merge pull request #147 from yipdw/sync/upstream
Fix error when following locked accounts (#4896)
Eugen Rochko [Mon, 11 Sep 2017 21:50:37 +0000 (23:50 +0200)]
Fix error when following locked accounts (#4896)
(cherry picked from commit
0ef9d45d0581dddf2f325033c43721f42fcfca9e )
Surinna Curtis [Thu, 14 Sep 2017 12:37:39 +0000 (07:37 -0500)]
Apply white-space: nowrap to account relationships icons
Surinna Curtis [Thu, 14 Sep 2017 03:54:14 +0000 (22:54 -0500)]
Tweak title text for mute notifications toggle to be clearer
Surinna Curtis [Thu, 14 Sep 2017 03:35:48 +0000 (22:35 -0500)]
fix typos in the migration
Surinna Curtis [Thu, 14 Sep 2017 03:26:43 +0000 (22:26 -0500)]
Add migration to default Mute#hide_notifications? to true
Surinna Curtis [Thu, 14 Sep 2017 02:04:05 +0000 (21:04 -0500)]
Fixed a typo that was breaking the account mute API endpoint
Surinna Curtis [Thu, 14 Sep 2017 01:44:38 +0000 (20:44 -0500)]
minor code style fixes oops
Surinna Curtis [Wed, 13 Sep 2017 23:32:10 +0000 (18:32 -0500)]
Refactor handling of default params for muting to make code cleaner
Surinna Curtis [Wed, 13 Sep 2017 22:42:52 +0000 (17:42 -0500)]
add an explanatory comment to AccountInteractions
Surinna Curtis [Sat, 9 Sep 2017 12:36:23 +0000 (07:36 -0500)]
fix a missing import
Surinna Curtis [Sat, 9 Sep 2017 12:26:32 +0000 (07:26 -0500)]
In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
Surinna Curtis [Sat, 9 Sep 2017 10:25:33 +0000 (05:25 -0500)]
satisfy eslint
Surinna Curtis [Sat, 9 Sep 2017 10:16:27 +0000 (05:16 -0500)]
make the hide/unhide notifications buttons work
Surinna Curtis [Sat, 9 Sep 2017 10:16:06 +0000 (05:16 -0500)]
Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
Surinna Curtis [Sat, 9 Sep 2017 10:06:50 +0000 (05:06 -0500)]
Show whether muted users' notifications are muted in account lists
Surinna Curtis [Sat, 9 Sep 2017 10:05:43 +0000 (05:05 -0500)]
Expose whether a mute hides notifications in the api/v1/relationships endpoint
Surinna Curtis [Sat, 2 Sep 2017 18:19:19 +0000 (13:19 -0500)]
Add more specs for the /api/v1/mutes/details endpoint
Surinna Curtis [Sat, 2 Sep 2017 18:10:10 +0000 (13:10 -0500)]
Define a serializer for /api/v1/mutes/details
Surinna Curtis [Sat, 2 Sep 2017 17:24:58 +0000 (12:24 -0500)]
Add a /api/v1/mutes/details route that just returns the array of mutes.
Surinna Curtis [Fri, 1 Sep 2017 01:59:47 +0000 (20:59 -0500)]
Put the label for the hide notifications checkbox in a label element.
Surinna Curtis [Sun, 6 Aug 2017 23:15:44 +0000 (20:15 -0300)]
add trailing newlines to files for Pork :)
Surinna Curtis [Sun, 6 Aug 2017 23:13:12 +0000 (20:13 -0300)]
specs for MuteService notifications params
Surinna Curtis [Sun, 6 Aug 2017 23:00:38 +0000 (20:00 -0300)]
Satisfy eslint.
Surinna Curtis [Sun, 6 Aug 2017 22:43:58 +0000 (19:43 -0300)]
Convert profile header mute to use mute modal
Surinna Curtis [Sun, 6 Aug 2017 22:36:04 +0000 (19:36 -0300)]
Break out a separate mute modal with a hide-notifications checkbox.
Surinna Curtis [Fri, 28 Jul 2017 05:12:34 +0000 (00:12 -0500)]
Less gross passing of notifications flag
Surinna Curtis [Fri, 28 Jul 2017 04:31:39 +0000 (23:31 -0500)]
API support for muting notifications (and specs)
Surinna Curtis [Fri, 28 Jul 2017 04:28:57 +0000 (23:28 -0500)]
Add support for muting notifications in MuteService
Surinna Curtis [Thu, 27 Jul 2017 14:08:45 +0000 (09:08 -0500)]
specs testing that hide_notifications in mutes actually hides notifications
Surinna Curtis [Thu, 27 Jul 2017 14:00:29 +0000 (09:00 -0500)]
Add specs for how mute! interacts with muting_notifications?
Surinna Curtis [Thu, 27 Jul 2017 12:52:45 +0000 (07:52 -0500)]
block notifications in notify_service from hard muted accounts
Surinna Curtis [Tue, 18 Jul 2017 02:10:37 +0000 (21:10 -0500)]
Add muting_notifications? and a notifications argument to mute!
Surinna Curtis [Sun, 16 Jul 2017 21:10:34 +0000 (16:10 -0500)]
Add a hide_notifications column to mutes
Surinna Curtis [Mon, 11 Sep 2017 00:43:52 +0000 (19:43 -0500)]
Fix a spuriously failing spec that assumed we required short bios like upstream
Surinna Curtis [Sun, 10 Sep 2017 21:00:26 +0000 (16:00 -0500)]
Remove unused imports
Surinna Curtis [Sun, 10 Sep 2017 19:10:30 +0000 (14:10 -0500)]
Merge pull request #143 from yipdw/sync/upstream
Merge with upstream's 1.6.0
David Yip [Sun, 10 Sep 2017 18:04:27 +0000 (13:04 -0500)]
Merge tag 'v1.6.0' into sync/upstream
beatrix [Sun, 10 Sep 2017 17:34:14 +0000 (13:34 -0400)]
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
Merge with 1.6.0rc4
STRAP IN BUCKAWOO HERE WE GO AGAIN
Eugen Rochko [Sun, 10 Sep 2017 13:10:03 +0000 (15:10 +0200)]
Bump to 1.6.0
Eugen Rochko [Sun, 10 Sep 2017 13:09:06 +0000 (15:09 +0200)]
Fix POST /api/v1/follows error when already following (#4878)
yoshipc [Sun, 10 Sep 2017 11:34:15 +0000 (20:34 +0900)]
Fix Japanese translation (#4876)
I translated the additional text ( added by #4871)
Eugen Rochko [Sun, 10 Sep 2017 08:26:51 +0000 (10:26 +0200)]
Bump version to 1.6.0rc5
Eugen Rochko [Sun, 10 Sep 2017 08:26:01 +0000 (10:26 +0200)]
Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)
Eugen Rochko [Sun, 10 Sep 2017 07:58:38 +0000 (09:58 +0200)]
Default follows for new users (#4871)
When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)
Eugen Rochko [Sun, 10 Sep 2017 06:48:11 +0000 (08:48 +0200)]
Fix dimensions of loading component for compose drawer (#4872)
David Yip [Sun, 10 Sep 2017 04:56:21 +0000 (23:56 -0500)]
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
beatrix [Sun, 10 Sep 2017 00:11:48 +0000 (20:11 -0400)]
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3
ohhhhhhhhhhh heck here we go
Yamagishi Kazutoshi [Sat, 9 Sep 2017 19:31:48 +0000 (04:31 +0900)]
Set fallback address when empty notification address (#4868)
David Yip [Sat, 9 Sep 2017 15:18:21 +0000 (10:18 -0500)]
Add missing import (patch by @MightyPork)
David Yip [Sat, 9 Sep 2017 19:28:08 +0000 (14:28 -0500)]
Merge tag 'v1.6.0rc3' into sync/upstream
David Yip [Sat, 9 Sep 2017 19:27:47 +0000 (14:27 -0500)]
Merge branch 'origin/master' into sync/upstream
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Quent-in [Sat, 9 Sep 2017 16:22:56 +0000 (18:22 +0200)]
i10n minors changes for 1.6 (#4867)
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
Eugen Rochko [Sat, 9 Sep 2017 15:36:27 +0000 (17:36 +0200)]
Fix errors preventing UnsubscribeService from working (#4866)
Eugen Rochko [Sat, 9 Sep 2017 14:23:44 +0000 (16:23 +0200)]
Add script to make embedded iframes autosize (#4853)
Eugen Rochko [Sat, 9 Sep 2017 13:09:50 +0000 (15:09 +0200)]
Disable mouse-based pause from #4859 (#4865)
It wasn't working ideally and introduced some annoying false positivies
Eugen Rochko [Sat, 9 Sep 2017 12:53:49 +0000 (14:53 +0200)]
Bump version to 1.6.0rc4
unarist [Sat, 9 Sep 2017 12:16:11 +0000 (21:16 +0900)]
Fix scroll behavior and others on paused timeline (#4864)
Resolved:
* Lot of redundant renders while mouse moving
* Scroll jumping when timeline loaded
* Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived
Unresolved:
* Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived
-> It needs to know which statuses are over the scrollTop
* New status indicator should be active when new statuses arrived while mouse moved recently
-> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving
Yamagishi Kazutoshi [Sat, 9 Sep 2017 11:42:48 +0000 (20:42 +0900)]
Fix second report (regression from
3b81baaaaf51ff1c70fb1f865eef07fdb33a5950 ) (#4863)
Eugen Rochko [Sat, 9 Sep 2017 11:41:45 +0000 (13:41 +0200)]
Add missing reject_media check before avatar download via ActivityPub (#4862)
Lynx Kotoura [Sat, 9 Sep 2017 00:26:58 +0000 (09:26 +0900)]
Scrollable tables in settings pages (#4857)
* Scrollable tables in settings pages
* Add space before curly brace
Eugen Rochko [Sat, 9 Sep 2017 00:26:41 +0000 (02:26 +0200)]
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement (#4859)
Eugen Rochko [Sat, 9 Sep 2017 00:02:44 +0000 (02:02 +0200)]
Fix #4852 - Check if already requested from FollowService (#4855)
Eugen Rochko [Sat, 9 Sep 2017 00:02:29 +0000 (02:02 +0200)]
Fix #4850 - When visibility missing from API call to toot, fallback to user preference (#4861)
unarist [Fri, 8 Sep 2017 19:43:34 +0000 (04:43 +0900)]
Refresh timeline after toot while the timeline is disconnected (#4858)
To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views.
After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.
unarist [Fri, 8 Sep 2017 16:20:03 +0000 (01:20 +0900)]
Handle stream_entry URL correctly in ActivityPub (#4854)
In before, the method uses stream_entry id as status id, so replied status was wrongly selected.
This PR uses StatusFinder which was introduced with `Api::Web::EmbedsController`.
Quent-in [Fri, 8 Sep 2017 11:55:47 +0000 (13:55 +0200)]
i10n update OC and FR (#4849)
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
Eugen Rochko [Fri, 8 Sep 2017 10:32:22 +0000 (12:32 +0200)]
Fix language filter codes (#4841)
* Fix language filter codes
CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)
* Fix zh name
Eugen Rochko [Fri, 8 Sep 2017 10:00:30 +0000 (12:00 +0200)]
"Mute conversation" option on all own toots, not just in notifications (#4844)
That way you can mute notifications for a toot before you get replies
to it or boosts or favourites
Eugen Rochko [Fri, 8 Sep 2017 10:00:17 +0000 (12:00 +0200)]
Fetch statuses/following/followers numbers from ActivityPub collections (#4840)
m4sk1n [Thu, 7 Sep 2017 20:51:48 +0000 (22:51 +0200)]
i18n: Update Polish translation (#4845)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Quent-in [Thu, 7 Sep 2017 20:07:03 +0000 (22:07 +0200)]
i10n OC / FR update Pinned toots (#4842)
* Added column.pins
New strings
* Added column.pins
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update password_change.oc.html.erb
* Update password_change.oc.text.erb
* Update reset_password_instructions.oc.html.erb
* Update reset_password_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
Eugen Rochko [Thu, 7 Sep 2017 18:18:34 +0000 (20:18 +0200)]
Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)
abcang [Thu, 7 Sep 2017 14:44:15 +0000 (23:44 +0900)]
Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)
PFM [Thu, 7 Sep 2017 14:18:41 +0000 (23:18 +0900)]
Use <button> instead of <div role="button"> (#4835)
voidSatisfaction [Thu, 7 Sep 2017 07:58:11 +0000 (16:58 +0900)]
Add Pinned toot column (#4817)
* Add Pinned_toot_section
* Fix add frozen_string_literal
* Fix delete no need controller and tests
* Fix replace query strings to axios params
* Fix change value to accountId and disabling more button
voidSatisfaction [Thu, 7 Sep 2017 07:55:42 +0000 (16:55 +0900)]
Feat add validation for report comment: characters under 1000 valid (#4833)
Joseph Mingrone [Thu, 7 Sep 2017 01:55:06 +0000 (22:55 -0300)]
Use casecmp() instead of casecmp?() for now (#4832)
* Use casecmp() instead of casecmp?() for now
casecmp?() is only available in ruby 2.4.0. Users running earlier ruby versions
would see errors, e.g., running
RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards.
* Correctly check whether casecmp() returns 0
Quent-in [Wed, 6 Sep 2017 23:55:03 +0000 (01:55 +0200)]
i10n update OC and FR files (#4824)
* Onboarding: corrections
Some missing letters and spaces or better wording
* Embed
Translated as Intégrer in FR / Embarcar in OC
Olivier Humbert [Wed, 6 Sep 2017 20:32:49 +0000 (22:32 +0200)]
Update fr.json (#4830)
typo
Eugen Rochko [Wed, 6 Sep 2017 18:57:52 +0000 (20:57 +0200)]
Fix locking migration on statuses table. Nullable column and NO default value (#4825)
Eugen Rochko [Wed, 6 Sep 2017 17:02:03 +0000 (19:02 +0200)]
Bump version to 1.6.0rc2
Eugen Rochko [Wed, 6 Sep 2017 17:01:28 +0000 (19:01 +0200)]
Switch to static URIs, new URI format in both protocols for new statuses (#4815)
* Decouple Status#local? from uri being nil
* Replace on-the-fly URI generation with stored URIs
- Generate URI in after_save hook for local statuses
- Use static value in TagManager when available, fallback to tag format
- Make TagManager use ActivityPub::TagManager to understand new format
- Adjust tests
* Use other heuristic for locality of old statuses, do not perform long query
* Exclude tombstone stream entries from Atom feed
* Prevent nil statuses from landing in Pubsubhubbub::DistributionWorker
* Fix URI not being saved (#4818)
* Add more specs for Status
* Save generated uri immediately
and also fix method order to minimize diff.
* Fix alternate HTML URL in Atom
* Fix tests
* Remove not-null constraint from statuses migration to speed it up
voidSatisfaction [Wed, 6 Sep 2017 15:32:15 +0000 (00:32 +0900)]
Add Smartphone screen favourite back button and adjust styles (#4813)
* Feat add get-back button on favourite columnHeader
* Style adjust nice looking get-back button
* Fix delete media query and add padding right
* fix: restore padding and add lastchild style for back-button
Masoud Abkenar [Wed, 6 Sep 2017 15:31:54 +0000 (17:31 +0200)]
i18n: update Persian translation (#4822)
Clworld [Wed, 6 Sep 2017 15:29:56 +0000 (00:29 +0900)]
fix scroll position (#4821)
Yamagishi Kazutoshi [Wed, 6 Sep 2017 14:25:19 +0000 (23:25 +0900)]
Update react-intl to version 2.4.0 (#4820)
PFM [Wed, 6 Sep 2017 11:55:47 +0000 (20:55 +0900)]
fix text position of NSFW for video file (#4819)
Yamagishi Kazutoshi [Wed, 6 Sep 2017 10:13:00 +0000 (19:13 +0900)]
Add environment sample for OpenStack Swift (#4816)
Adam Thurlow [Tue, 5 Sep 2017 21:17:06 +0000 (18:17 -0300)]
swift-enable the paperclip! :paperclip: (#2322)
abcang [Tue, 5 Sep 2017 18:56:20 +0000 (03:56 +0900)]
Do not execute the job with the same arguments as the retry job (#4814)
Eugen Rochko [Tue, 5 Sep 2017 18:55:25 +0000 (20:55 +0200)]
Fix mentions in direct statuses not being delivered via AP (#4806)
Eugen Rochko [Tue, 5 Sep 2017 15:48:13 +0000 (17:48 +0200)]
Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
Lynx Kotoura [Tue, 5 Sep 2017 10:31:24 +0000 (19:31 +0900)]
Adjust status embeds (#4808)
* Adjust status embeds
Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.
* Remove trailing whitespace
* Using width from the variable
takayamaki [Tue, 5 Sep 2017 10:30:01 +0000 (19:30 +0900)]
add index_notifications_on_id_and_account_id_and_activity_type on notifications table (#4750)
Treyssat-Vincent Nino [Tue, 5 Sep 2017 10:13:25 +0000 (12:13 +0200)]
comment correction (#4812)
This page took 0.084388 seconds and 3 git commands to generate.