]>
cat aescling's git repositories - mastodon.git/log
kibigo! [Fri, 29 Dec 2017 22:55:06 +0000 (14:55 -0800)]
WIP <Compose> Refactor; SCSS ed.
kibigo! [Wed, 27 Dec 2017 22:28:41 +0000 (14:28 -0800)]
WIP <Compose> Refactor; <OnboardingModal> ed.
kibigo! [Wed, 27 Dec 2017 00:54:28 +0000 (16:54 -0800)]
WIP <Compose> Refactor; <Drawer> ed.
kibigo! [Sun, 24 Dec 2017 06:16:45 +0000 (22:16 -0800)]
WIPgit status <Compose> Refactor; <Composer> ed.
Jenkins [Wed, 3 Jan 2018 20:17:13 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Quenty31 [Wed, 3 Jan 2018 20:05:54 +0000 (21:05 +0100)]
l10n OC language (#6169)
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
ThibG [Wed, 3 Jan 2018 19:51:33 +0000 (20:51 +0100)]
Don't normalize URLs in toots (#6134)
* Don't normalize URLs in toots
URL normalization is ill-defined and may cause certain links to break.
* Change specs since we are not normalizing user-provided URLs
Akihiko Odaki [Wed, 3 Jan 2018 17:08:57 +0000 (02:08 +0900)]
Allow to dereference Follow object for ActivityPub (#5772)
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
Marcin Mikołajczak [Wed, 3 Jan 2018 13:45:24 +0000 (14:45 +0100)]
i18n: Update Polish translation (#6168)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Yamagishi Kazutoshi [Wed, 3 Jan 2018 12:00:39 +0000 (21:00 +0900)]
Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
Jenkins [Wed, 3 Jan 2018 04:17:11 +0000 (04:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
ThibG [Wed, 3 Jan 2018 03:57:57 +0000 (04:57 +0100)]
Allow HTTP caching of json view of public statuses (#6115)
* Allow HTTP caching of json view of public statuses
HTML views are not cached as they can contain private statuses as well
* Disable session cookies for ActivityPub json rendering of public toots
Akihiko Odaki [Wed, 3 Jan 2018 03:39:14 +0000 (12:39 +0900)]
Set background to the navigation of Getting Started column (#6163)
The background of the navigation matters because its scrollbar is
transparent.
puckipedia [Wed, 3 Jan 2018 02:54:08 +0000 (03:54 +0100)]
[!] Sanitize incoming classlist properly (#6162)
* Sanitize classlist properly
* Actually properly sanitize every class after the first
* Improve Formatter spec to check for multiple classes and non-space whitespace
Eugen Rochko [Tue, 2 Jan 2018 23:38:20 +0000 (00:38 +0100)]
Update moved-to property when it's removed too (#6160)
* Fix #6140 - Update moved-to property when it's removed too
* Remove trailing whitespace
Eugen Rochko [Tue, 2 Jan 2018 23:38:02 +0000 (00:38 +0100)]
Don't leave behind husk of remotely-deleted profile (#6159)
There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.
Noiob [Tue, 2 Jan 2018 18:35:24 +0000 (19:35 +0100)]
Fix newlines-to-spaces functionality (#6158)
yay for regexes, amirite
Patrick Figel [Tue, 2 Jan 2018 15:55:00 +0000 (16:55 +0100)]
Add confirmation step for email changes (#6071)
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
ThibG [Tue, 2 Jan 2018 13:24:52 +0000 (14:24 +0100)]
Display a warning when composing unlisted toots with something looking like a hashtag (#6132)
Eugen Rochko [Tue, 2 Jan 2018 13:02:53 +0000 (14:02 +0100)]
Fix stats expiring too quickly because of variable mistake (#6155)
Akihiko Odaki [Tue, 2 Jan 2018 12:50:54 +0000 (21:50 +0900)]
Rename key to path in actions and reducers for settings (#6105)
Otakan [Tue, 2 Jan 2018 12:38:12 +0000 (21:38 +0900)]
delete X-UA-Compatible (#6068)
* delete X-UA-Compatible
* undo
* restore
Branko Kokanovic [Tue, 2 Jan 2018 11:39:12 +0000 (11:39 +0000)]
Adding Serbian latin translations (#6146)
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
David Yip [Tue, 2 Jan 2018 06:26:44 +0000 (00:26 -0600)]
More ../ -> ~.
David Yip [Tue, 2 Jan 2018 06:11:41 +0000 (00:11 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
Akihiko Odaki [Tue, 2 Jan 2018 04:28:49 +0000 (13:28 +0900)]
Use const instead of let for constant (#6106)
Akihiko Odaki [Tue, 2 Jan 2018 04:07:56 +0000 (13:07 +0900)]
Show mastodon on modal (#6129)
Jenkins [Sun, 31 Dec 2017 09:17:15 +0000 (09:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Branko Kokanovic [Sun, 31 Dec 2017 08:28:20 +0000 (08:28 +0000)]
Adding Serbian translation (#6133)
* Adding Serbian translation
* i18n-tasks normalize
David Yip [Sun, 31 Dec 2017 00:24:38 +0000 (18:24 -0600)]
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @
f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
David Yip [Sat, 30 Dec 2017 23:20:07 +0000 (17:20 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/controllers/auth/confirmations_controller.rb
David Yip [Sat, 30 Dec 2017 23:17:37 +0000 (17:17 -0600)]
Switch to tootsuite's elephant friend for the drawer
This version has a transparent background, which works better with the
wave.
David Yip [Sat, 30 Dec 2017 23:15:20 +0000 (17:15 -0600)]
Use ~ notation in components for image references
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
Jeong Arm [Sat, 30 Dec 2017 01:44:19 +0000 (10:44 +0900)]
Translate Korean (#6131)
Relates to #6125, #6099
beatrix [Sat, 30 Dec 2017 01:43:43 +0000 (20:43 -0500)]
keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
Eugen Rochko [Fri, 29 Dec 2017 18:52:04 +0000 (19:52 +0100)]
Add more instance stats APIs (#6125)
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
David Yip [Thu, 28 Dec 2017 19:23:41 +0000 (13:23 -0600)]
Merge pull request #288 from chriswmartin/fix-gif-avatars
Fix GIF avatars not autoplaying when gif autoplay is enabled
MitarashiDango [Thu, 28 Dec 2017 15:20:34 +0000 (00:20 +0900)]
bug fix (WebPush does not work) (#6120)
cwm [Thu, 28 Dec 2017 14:30:51 +0000 (08:30 -0600)]
Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)
ThibG [Wed, 27 Dec 2017 17:21:12 +0000 (18:21 +0100)]
Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)
* Make host_meta/webfinger replies cacheable (fixes #6100)
Drop common code for handling users and sessions as webfinger queries
are very basic, public APIs.
Also explicitly mark results as cacheable with “expires_in”.
* Add “Vary: Accept” header for caching since content-negociation is used
David Yip [Wed, 27 Dec 2017 04:24:19 +0000 (22:24 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
Akihiko Odaki [Wed, 27 Dec 2017 02:31:30 +0000 (11:31 +0900)]
Move the mastodon on Getting Started column to drawer column (#6109)
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
Akihiko Odaki [Wed, 27 Dec 2017 02:29:49 +0000 (11:29 +0900)]
Fix XML oEmbed support discovery (#6104)
beatrix [Tue, 26 Dec 2017 22:03:29 +0000 (17:03 -0500)]
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
Merge various small vanilla updates into glitch
beatrix [Tue, 26 Dec 2017 22:03:00 +0000 (17:03 -0500)]
Merge pull request #285 from chriswmartin/detailed-status-actions
Add mute, block, conversation mute actions to detailed status dropdown
cwm [Tue, 26 Dec 2017 20:20:41 +0000 (14:20 -0600)]
Set direction style to reply indicator (tootsuite pr #6006)
cwm [Tue, 26 Dec 2017 20:04:52 +0000 (14:04 -0600)]
Reduce motion for boost animation (tootsuite pr #5871)
cwm [Tue, 26 Dec 2017 19:49:53 +0000 (13:49 -0600)]
Fix layout for RTL (tootsuite pr #6014, #6018)
cwm [Tue, 26 Dec 2017 19:30:23 +0000 (13:30 -0600)]
Fix focused background color of favourited direct toot (tootsuite pr #6021)
cwm [Tue, 26 Dec 2017 19:28:19 +0000 (13:28 -0600)]
Move dropdown transform origin (tootsuite pr #6091)
cwm [Tue, 26 Dec 2017 19:25:43 +0000 (13:25 -0600)]
onMuteNotifications validation (tootsuite pr #6092)
cwm [Tue, 26 Dec 2017 19:21:20 +0000 (13:21 -0600)]
Rename settingKey to settingPath (tootsuite pr #6046 & #6098)
Jenkins [Tue, 26 Dec 2017 18:17:16 +0000 (18:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
beatrix [Tue, 26 Dec 2017 17:43:52 +0000 (12:43 -0500)]
add ruby-progressbar to gemfile (fixes #6110) (#6111)
takayamaki [Tue, 26 Dec 2017 16:56:31 +0000 (01:56 +0900)]
more faster index on notifications table (#6108)
cwm [Tue, 26 Dec 2017 16:41:44 +0000 (10:41 -0600)]
use 'flavours/glitch/' prefix in new imports
cwm [Tue, 26 Dec 2017 16:13:38 +0000 (10:13 -0600)]
Add mute, block, conversation mute actions to detailed status dropdown menu
Jenkins [Mon, 25 Dec 2017 20:17:10 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Chris [Mon, 25 Dec 2017 19:56:05 +0000 (14:56 -0500)]
Add mute, block, conversation mute actions to detailed status dropdown menu (#6099)
* removed references to hideOnMobile in column_link and getting_started
* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226)
* remove unused withDismiss in detailed status
MitarashiDango [Mon, 25 Dec 2017 15:14:06 +0000 (00:14 +0900)]
Additional prop name change. (#6098)
Yamagishi Kazutoshi [Mon, 25 Dec 2017 14:02:08 +0000 (23:02 +0900)]
Add supported Node.js version to package.json (#6096)
Jenkins [Sun, 24 Dec 2017 15:17:12 +0000 (15:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Eugen Rochko [Sun, 24 Dec 2017 15:14:33 +0000 (16:14 +0100)]
Add rake task to check and purge accounts that are missing in origin (#6085)
* Add rake task to check and purge accounts that are missing in origin
* Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts
Neetshin [Sun, 24 Dec 2017 08:18:45 +0000 (08:18 +0000)]
Add validation for onMuteNotifications (#6092)
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
* Add validation for onMuteNotifications
Nolan Lawson [Sun, 24 Dec 2017 03:48:31 +0000 (19:48 -0800)]
Reduce motion for boost animation (#5871)
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
Akihiko Odaki [Sun, 24 Dec 2017 03:47:35 +0000 (12:47 +0900)]
Refactor web_push_subscription (#6047)
* Remove onSave method in mapped properties for column_settings
* Make web_push_subscription.register an action
Chris [Sun, 24 Dec 2017 03:47:02 +0000 (22:47 -0500)]
removed references to hideOnMobile in column_link and getting_started (#6082)
* removed references to hideOnMobile in column_link and getting_started
* move keyboard shortcuts back below blocked users
cpsdqs [Sat, 23 Dec 2017 23:53:03 +0000 (00:53 +0100)]
Move dropdown transform origin to top edge (#6091)
Jenkins [Fri, 22 Dec 2017 04:17:14 +0000 (04:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
beatrix [Fri, 22 Dec 2017 03:49:30 +0000 (22:49 -0500)]
Merge pull request #280 from KnzkDev/add-en-ja
i18n: Add en and ja
ncls7615 [Fri, 22 Dec 2017 03:22:41 +0000 (12:22 +0900)]
Update and add some translate
ncls7615 [Fri, 22 Dec 2017 03:11:28 +0000 (12:11 +0900)]
Add more en and ja
ncls7615 [Fri, 22 Dec 2017 03:01:38 +0000 (12:01 +0900)]
Add en and ja
nightpool [Fri, 22 Dec 2017 01:17:59 +0000 (19:17 -0600)]
enforce LOCAL_HTTPS=true in production (#6061)
* enforce https in production
* note changes in production env sample
* typo fix
ThibG [Fri, 22 Dec 2017 01:15:08 +0000 (02:15 +0100)]
Reduce the number of synchronous resolves when posting toots (#6075)
ThibG [Fri, 22 Dec 2017 01:14:17 +0000 (02:14 +0100)]
Display deleted users' role as “Suspended” (#6080)
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
beatrix [Thu, 21 Dec 2017 23:47:07 +0000 (18:47 -0500)]
Merge pull request #266 from chriswmartin/getting-started-improvements
Getting started column improvements
beatrix [Thu, 21 Dec 2017 22:46:53 +0000 (17:46 -0500)]
Merge pull request #278 from KnzkDev/fix/acc-header-avatar
Fix account header avatar
ncls7615 [Thu, 21 Dec 2017 22:12:49 +0000 (07:12 +0900)]
Fix account header avatar
beatrix [Thu, 21 Dec 2017 21:10:36 +0000 (16:10 -0500)]
Merge pull request #277 from glitch-soc/273-add-data-status-by-to-detailed-status
Add data-status-by back to DetailedStatus component. Fixes #273.
David Yip [Thu, 21 Dec 2017 19:22:33 +0000 (13:22 -0600)]
Add data-status-by back to DetailedStatus component. Fixes #273.
cwm [Thu, 21 Dec 2017 19:04:40 +0000 (13:04 -0600)]
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)
cwm [Thu, 21 Dec 2017 18:45:11 +0000 (12:45 -0600)]
remove themes.default from i18n-tasks unused check
beatrix [Thu, 21 Dec 2017 13:30:22 +0000 (08:30 -0500)]
Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab
Wrap <Avatar> in account header in a link to that account's page (fixes #245)
beatrix [Thu, 21 Dec 2017 13:30:05 +0000 (08:30 -0500)]
Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
Set packs on 2FA-related pages. Fixes #271.
David Yip [Thu, 21 Dec 2017 11:05:18 +0000 (05:05 -0600)]
Wrap <Avatar> in account header in a link to that account's page. Fixes #245.
David Yip [Thu, 21 Dec 2017 11:24:17 +0000 (05:24 -0600)]
Remove themes.default from i18n-tasks unused check
This translation key comes in from tootsuite, but the flavours system
does not use it.
David Yip [Thu, 21 Dec 2017 02:02:50 +0000 (20:02 -0600)]
Remove unused themes.default key in ko locale.
cwm [Wed, 20 Dec 2017 15:50:29 +0000 (09:50 -0600)]
add keyboard shortcuts to getting started (fixes #275)
David Yip [Wed, 20 Dec 2017 09:15:54 +0000 (03:15 -0600)]
Set packs on 2FA-related pages. Fixes #271.
Specifically, this commit:
- changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from
S::BaseController, because this gives us the necessary actions and
packs
- prepends set_pack to Auth::SessionsController's action chain so that
it takes effect in time for render :two_factor
Jenkins [Wed, 20 Dec 2017 08:17:15 +0000 (08:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Akihiko Odaki [Wed, 20 Dec 2017 07:19:59 +0000 (16:19 +0900)]
Rename settingKey in setting_toggle to settingPath (#6046)
Neetshin [Wed, 20 Dec 2017 02:46:25 +0000 (02:46 +0000)]
Replace <code> to <kbd> in KeyboardShortcuts component (#6049)
* Add aria-autocomplete='list' in Textaria
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
* Make detect empty string brefore assign upload description
* Change code elements in keyboard-shortcuts component to kbd
Jeong Arm [Wed, 20 Dec 2017 02:45:50 +0000 (11:45 +0900)]
Update Korean translation (#6050)
* Update Korean translation
* Translate Korean for javascript
* Add missing translations on simple_form
beatrix [Tue, 19 Dec 2017 15:35:02 +0000 (10:35 -0500)]
Merge pull request #272 from KnzkDev/add-en-ja
i18n: Update some locale files
ncls7615 [Tue, 19 Dec 2017 11:16:48 +0000 (20:16 +0900)]
Add en and ja
cwm [Mon, 18 Dec 2017 04:21:15 +0000 (22:21 -0600)]
missed a semicolon
cwm [Mon, 18 Dec 2017 04:00:25 +0000 (22:00 -0600)]
use makeMapStateToProps
cwm [Mon, 18 Dec 2017 03:25:18 +0000 (21:25 -0600)]
use list-ul icon in list header and web/lists
Jenkins [Sun, 17 Dec 2017 03:17:14 +0000 (03:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master