]>
cat aescling's git repositories - mastodon.git/log
abcang [Thu, 6 Jul 2017 19:31:03 +0000 (04:31 +0900)]
Improve Activity stream spoiler (#4088)
STJrInuyasha [Thu, 6 Jul 2017 19:30:37 +0000 (12:30 -0700)]
Parse links in status content on update as well as mount (#4042)
* Update links in status content on update as well as mount
Fixes occasional bugs with mentions and hashtags not being set to open in a new column like they should, and instead opening in a new page
* use classList instead of raw className
unarist [Thu, 6 Jul 2017 19:26:21 +0000 (04:26 +0900)]
Unobserve status on unmount (#4013)
This fixes a warning on status unmounting (e.g. deletion).
This also resets IntersectionObserverWrapper on disconnect to avoid `unobserve()` calls
which has bug in Edge.
Mantas [Thu, 6 Jul 2017 19:26:07 +0000 (22:26 +0300)]
Remove ugly blue highlight on Android browsers (#4031)
Quent-in [Thu, 6 Jul 2017 19:10:12 +0000 (21:10 +0200)]
l10n Occitan locale (#4089)
* Small adjustments
About the report part.
* Update time format
Shin Kojima [Thu, 6 Jul 2017 13:27:02 +0000 (22:27 +0900)]
Fix embedded SVG fill attribute (#4086)
* Fix embedded SVG fill attribute
SCSS darken/lighten functions may not return a color value, but a color
name like "white". See following example:
https://www.sassmeister.com/gist/
c41da93b87d536890ddf30a1f42e7816
This patch will normalize $color argument to FFFFFF style.
I also changed the function name from "url-friendly-colour" to
"hex-color", Because...
1. The name "url-friendly" is not meaningful enough to describe what it
does.
2. It is familier to me using "color" rather than "colour"
kojima:kojiMac mastodon[master]$ git grep -l colour
app/javascript/styles/boost.scss
spec/fixtures/files/attachment.jpg
kojima:kojiMac mastodon[master]$ git grep -l color
.rspec
.scss-lint.yml
Gemfile.lock
app/javascript/mastodon/features/status/components/action_bar.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/admin.scss
app/javascript/styles/basics.scss
app/javascript/styles/boost.scss
app/javascript/styles/compact_header.scss
app/javascript/styles/components.scss
app/javascript/styles/containers.scss
app/javascript/styles/footer.scss
app/javascript/styles/forms.scss
app/javascript/styles/landing_strip.scss
app/javascript/styles/reset.scss
app/javascript/styles/stream_entries.scss
app/javascript/styles/tables.scss
app/javascript/styles/variables.scss
app/views/admin/subscriptions/_subscription.html.haml
app/views/layouts/application.html.haml
app/views/layouts/error.html.haml
app/views/manifests/show.json.rabl
bin/webpack-dev-server
config/initializers/httplog.rb
public/500.html
public/emoji/1f1e6-1f1e8.svg
public/emoji/1f1ec-1f1f8.svg
public/emoji/1f1f3-1f1ee.svg
public/emoji/1f1fb-1f1ec.svg
spec/fixtures/requests/idn.txt
yarn.lock
* Add semicolon
m4sk1n [Thu, 6 Jul 2017 13:25:27 +0000 (15:25 +0200)]
i18n: minor changes in Polish translation (#4087)
* i18n: minor changes in Polish translation
* Update pl.json
Akihiko Odaki (@fn_aki@pawoo.net) [Wed, 5 Jul 2017 21:58:03 +0000 (06:58 +0900)]
Explicitly require MIME::Types (#4083)
abcang [Wed, 5 Jul 2017 12:54:21 +0000 (21:54 +0900)]
Fix Nokogiri::HTML at FetchLinkCardService (#4072)
unarist [Wed, 5 Jul 2017 12:51:53 +0000 (21:51 +0900)]
Show LoadMore button on Notifications even if all items are filtered (#4077)
Yamagishi Kazutoshi [Wed, 5 Jul 2017 12:51:28 +0000 (21:51 +0900)]
Format datetime of subscriptions on admin UI (#4078)
m4sk1n [Tue, 4 Jul 2017 21:34:00 +0000 (23:34 +0200)]
i18n: Updated Polish translation (#4068)
* i18n: Updated Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* fuggin nano
Gyuhwan Park [Tue, 4 Jul 2017 15:09:17 +0000 (00:09 +0900)]
i18n: Update korean translation (#4066)
* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Updated korean translation
* i18n: fix test fails
* Updated korean translation
Minori Hiraoka [Tue, 4 Jul 2017 14:48:22 +0000 (23:48 +0900)]
Fix Korean translation (#4065)
* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Update simple_form.ko.yml
Translation error fix - password change form
* Update simple_form.ko.yml
* Update ko.json
Missing translation
Gyuhwan Park [Tue, 4 Jul 2017 14:11:23 +0000 (23:11 +0900)]
i18n: Add korean translation (#4064)
* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Updated korean translation
* i18n: fix test fails
Yamagishi Kazutoshi [Tue, 4 Jul 2017 13:19:54 +0000 (22:19 +0900)]
Change webpack-dev-server repository (#4061)
Yamagishi Kazutoshi [Tue, 4 Jul 2017 13:19:24 +0000 (22:19 +0900)]
Customizable privacy policy from admin interface (#4062)
Akihiko Odaki (@fn_aki@pawoo.net) [Mon, 3 Jul 2017 11:17:27 +0000 (20:17 +0900)]
Remove sort in Feed (#4050)
In from_redis method, statuses retrieved from the database was mapped to
the IDs retrieved from Redis. It was equivalent to order from high to low
because those IDs are sorted in the same order.
Statuses are ordered with the ID by default, so we do not have to reorder.
Sorting statuses in the database is even faster since the IDs are indexed
with B-tree.
Yamagishi Kazutoshi [Mon, 3 Jul 2017 09:56:58 +0000 (18:56 +0900)]
Upgrade chai-enzyme, precss and uws (#4010)
* Update chai-enzyme to v0.8.0
* Upgrade precss to v2.0.0
* Upgrade uws to v8.14.0
Yamagishi Kazutoshi [Mon, 3 Jul 2017 09:04:35 +0000 (18:04 +0900)]
Add fa-fw class to user agent icon (#4047)
abcang [Mon, 3 Jul 2017 09:03:34 +0000 (18:03 +0900)]
Rescue exceptions caused by FetchLinkCardService (#4045)
のら [Mon, 3 Jul 2017 09:02:59 +0000 (18:02 +0900)]
Update Japanese translation (#4051)
Nolan Lawson [Mon, 3 Jul 2017 09:02:36 +0000 (02:02 -0700)]
Faster emojify() by avoiding str.replace() entirely (#4049)
Ratmir Karabut [Sun, 2 Jul 2017 23:30:22 +0000 (02:30 +0300)]
Update Russian translation (sessions) (#4041)
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
Damien Erambert [Sun, 2 Jul 2017 16:36:35 +0000 (09:36 -0700)]
Update French locales (#4034)
* add missing locales for French translation
* accent "Media" in the front-end locales
* images => médias
* Change 'rapport' to 'signalement' in French locales to be more coherent
* fix typo
* remove duplicate EN locale
* translate missing locales
* update missing locale
* fix typo
* unify with "utilisateur⋅ice⋅s"
* address PR comments
Sorin Davidoi [Sun, 2 Jul 2017 13:55:50 +0000 (15:55 +0200)]
fix(components/columns_area): Increase delta for swipe detection (#4037)
unarist [Sat, 1 Jul 2017 19:18:38 +0000 (04:18 +0900)]
Update Japanese translation (Credentials -> Security) (#4025)
Eugen Rochko [Sat, 1 Jul 2017 12:50:10 +0000 (14:50 +0200)]
Fix height issue in report modal
Nolan Lawson [Fri, 30 Jun 2017 15:29:22 +0000 (08:29 -0700)]
Faster emojify() algorithm, avoid regex replace (#4019)
* Faster emojify() algorithm, avoid regex replace
* add semicolon
Matt Jankowski [Fri, 30 Jun 2017 11:43:34 +0000 (07:43 -0400)]
Add controller spec for manifests controller (#4003)
Nolan Lawson [Fri, 30 Jun 2017 11:43:26 +0000 (04:43 -0700)]
Fix webpack-dev-server on Windows (#4000)
* Fix webpack-dev-server on Windows
* Serve webpack from 0.0.0.0, access at 127.0.0.1
Matt Jankowski [Fri, 30 Jun 2017 11:42:04 +0000 (07:42 -0400)]
Version bumps for gems (#4002)
* Update aws-sdk to version 2.10.4
* Update bootsnap to version 1.1.1
* Update capistrano to version 3.8.2
* Update capybara to version 2.14.4
* Update cld3 to version 3.1.3
* Update http_accept_language to version 2.1.1
* Update sidekiq to version 5.0.3
* Update rspec-sidekiq to version 3.0.3
* Update sidekiq-scheduler to version 2.1.7
* Update oj to version 3.2.0
* Update openssl to version 2.0.4
* Update pg to version 0.21.0
* Update twitter-text to version 1.14.6
* Update unicode-display_width to version 1.3.0
* Update scss_lint to version 0.54.0
* Update hamlit to version 2.8.4
* Update erubi to version 1.6.1
* Update httplog to version 0.99.4
* Update aws-sdk to version 2.10.6
Yamagishi Kazutoshi [Fri, 30 Jun 2017 11:40:43 +0000 (20:40 +0900)]
Fix that AdminMailer does not send (#4012)
Yamagishi Kazutoshi [Fri, 30 Jun 2017 11:40:14 +0000 (20:40 +0900)]
Remove babel-cli (#4011)
Yamagishi Kazutoshi [Fri, 30 Jun 2017 11:40:00 +0000 (20:40 +0900)]
Fix broken style in media gallery (regression from #3963) (#4014)
Akihiko Odaki (@fn_aki@pawoo.net) [Fri, 30 Jun 2017 11:39:42 +0000 (20:39 +0900)]
Do not raise an error if PrecomputeFeed could not find any status (#4015)
abcang [Fri, 30 Jun 2017 11:38:36 +0000 (20:38 +0900)]
Rescue Addressable::URI::InvalidURIError at Remotable (#4017)
Yamagishi Kazutoshi [Fri, 30 Jun 2017 03:37:41 +0000 (12:37 +0900)]
Replace state to /web when root path (#4009)
Naoki Kosaka [Fri, 30 Jun 2017 03:37:17 +0000 (12:37 +0900)]
Fix media-gallery, overflow is hidden. (#4008)
abcang [Thu, 29 Jun 2017 11:04:07 +0000 (20:04 +0900)]
rescue HTTP::ConnectionError (#3992)
Yamagishi Kazutoshi [Thu, 29 Jun 2017 11:03:03 +0000 (20:03 +0900)]
Upgrade jsdom to version 11.0.0 (#3994)
Akihiko Odaki (@fn_aki@pawoo.net) [Wed, 28 Jun 2017 23:43:10 +0000 (08:43 +0900)]
Cover Admin::AccountsController more (#3327)
Akihiko Odaki (@fn_aki@pawoo.net) [Wed, 28 Jun 2017 23:25:31 +0000 (08:25 +0900)]
Use multiple pairs for zadd in PrecomputeFeedService (#3990)
Akihiko Odaki (@fn_aki@pawoo.net) [Wed, 28 Jun 2017 23:17:26 +0000 (08:17 +0900)]
Reduce number of commands in FeedManager#trim (#3989)
Eugen Rochko [Wed, 28 Jun 2017 15:44:17 +0000 (17:44 +0200)]
Bump version to 1.4.7
Eugen Rochko [Wed, 28 Jun 2017 15:43:48 +0000 (17:43 +0200)]
Do not fail to create access token if superapp was never created (#3986)
Yamagishi Kazutoshi [Wed, 28 Jun 2017 14:45:21 +0000 (23:45 +0900)]
Add Japanese translations (#3985)
ref #3929, #3935, #3949, #3981
Akihiko Odaki (@fn_aki@pawoo.net) [Wed, 28 Jun 2017 12:50:23 +0000 (21:50 +0900)]
Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)
m4sk1n [Wed, 28 Jun 2017 12:07:53 +0000 (14:07 +0200)]
i18n: added email to activerecord.pl.yml (#3981)
m4sk1n [Tue, 27 Jun 2017 21:14:02 +0000 (23:14 +0200)]
i18n: Minor fix in devise.pl.yml (#3978)
m4sk1n [Tue, 27 Jun 2017 21:10:43 +0000 (23:10 +0200)]
i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
m4sk1n [Tue, 27 Jun 2017 20:21:35 +0000 (22:21 +0200)]
i18n: E-mail notifications to admins about new reports (pl) (#3975)
m4sk1n [Tue, 27 Jun 2017 20:14:31 +0000 (22:14 +0200)]
i18n: Turn report screen into a modal (pl) (#3974)
Sorin Davidoi [Tue, 27 Jun 2017 16:43:53 +0000 (18:43 +0200)]
fix(components/status): Up & down jump due to content being added to the DOM (#3972)
Eugen Rochko [Tue, 27 Jun 2017 16:07:21 +0000 (18:07 +0200)]
Turn report screen into a modal (#3965)
Midgard [Tue, 27 Jun 2017 12:22:36 +0000 (14:22 +0200)]
Use instance name in email notifications instead of "Mastodon" (#3763)
* Use instance name in "password changed" mail
instead of "Mastodon".
Fixes tootsuite#2620.
* Use instance name in password reset mail
instead of "Mastodon".
Debanshu Kundu [Tue, 27 Jun 2017 12:18:53 +0000 (17:48 +0530)]
#1456 Added rake task to add a user. (#1482)
Sorin Davidoi [Tue, 27 Jun 2017 11:46:37 +0000 (13:46 +0200)]
Responsive images in media gallery (#3963)
* feat(components/media_gallery): Responsive images
* fix(components/media_gallery): Link to image URL
Yamagishi Kazutoshi [Tue, 27 Jun 2017 11:46:11 +0000 (20:46 +0900)]
Update dependencies for Node.js (#3967)
* Update @storybook/addon-actions to v3.1.6
* Update @storybook/react to v3.1.6
* Update babel-loader to v7.1.0
* Update babel-plugin-transform-react-remove-prop-types to v0.4.6
* Update enzyme to v2.9.1
* Update fsevents to v1.1.2
* Update intersection-observer to v0.3.2
* Update npmlog to v4.1.2
* Update pg to v6.4.0
* Update postcss-loader to v2.0.6
* Update rails-ujs to v5.1.2
* Update react to v15.6.1
* Update react-addons-shallow-compare to v15.6.0
* Update react-dom to v15.6.0
* Update react-notification to v6.7.1
* Update react-test-renderer to v15.6.1
* Update react-textarea-autosize to v5.0.7
* Update redux to v3.7.1
* Update resolve-url-loader to v2.1.0
* Update sass-loader to v6.0.6
* Update sinon to v2.3.5
* Update stringz to v0.2.2
* Update uuid to v3.1.0
* Update websocket.js to v0.1.12
* Update yargs to v8.0.2
* yarn upgrade
Yamagishi Kazutoshi [Tue, 27 Jun 2017 11:43:53 +0000 (20:43 +0900)]
Maintain aspect ratio for preview image (#3966)
Yamagishi Kazutoshi [Tue, 27 Jun 2017 11:41:03 +0000 (20:41 +0900)]
Update Rails to v5.1.2 (#3968)
Eugen Rochko [Mon, 26 Jun 2017 22:04:00 +0000 (00:04 +0200)]
Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
ThibG [Mon, 26 Jun 2017 17:39:58 +0000 (19:39 +0200)]
Raise an error if salmon request response is unsatisfactory (#3960)
m4sk1n [Mon, 26 Jun 2017 15:18:45 +0000 (17:18 +0200)]
i18n: Updated Polish translation (#3956)
* i18n: Updated Polish translation
* Update pl.yml
m4sk1n [Mon, 26 Jun 2017 15:10:54 +0000 (17:10 +0200)]
i18n: Warning to look into the spam folder (pl) (#3955)
Daniel Hunsaker [Mon, 26 Jun 2017 11:15:24 +0000 (05:15 -0600)]
Add .gitattributes file to avoid unwanted CRLF (#3954)
When Windows checks out files, it defaults to changing line endings to CRLF. If these files are then copied to a Linux system to be run, and the endings aren't changed at some point in that process, things break. This file forces git to use LF for all text files on all systems (except the request testing specfiles) to prevent issues everywhere.
Alda Marteau-Hardi [Mon, 26 Jun 2017 11:04:36 +0000 (13:04 +0200)]
Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952)
Yamagishi Kazutoshi [Mon, 26 Jun 2017 02:49:39 +0000 (11:49 +0900)]
Stop using Babel with streaming server (#3950)
Takuya Yoshida [Sun, 25 Jun 2017 23:46:15 +0000 (08:46 +0900)]
Re-fix errorMiddleware (#3922)
unarist [Sun, 25 Jun 2017 23:45:50 +0000 (08:45 +0900)]
Ignore DB_NAME for development env on streaming as well as rails side (#3948)
Eugen Rochko [Sun, 25 Jun 2017 21:51:46 +0000 (23:51 +0200)]
Fix #3910 - Require OTP authentication to disable 2FA (#3935)
* Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability
to generate new OTP backup codes *after* initial backup codes were handed
out during activation
* Restore recovery code re-generation
* Improve display of some 2FA elements
Eugen Rochko [Sun, 25 Jun 2017 21:51:32 +0000 (23:51 +0200)]
Bind web UI access tokens to sessions (#3940)
* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
* Fix #2347 - Bind web UI access token to session
When you logout, session also destroys the access token, so it's no longer
valid. If access token is destroyed some other way, the session is also
destroyed, requiring a re-login.
Fix #1681 - Add scheduler to remove revoked access tokens and grants
* Fix test
amazedkoumei [Sun, 25 Jun 2017 21:29:22 +0000 (06:29 +0900)]
fix unnecessary variable (#3947)
Eugen Rochko [Sun, 25 Jun 2017 20:13:02 +0000 (22:13 +0200)]
Rename "Credentials" page to "Security" for clarity (#3941)
* Rename "Credentials" page to "Security" for clarity
* Change "security" icon from cog to lock
Sorin Davidoi [Sun, 25 Jun 2017 19:43:27 +0000 (21:43 +0200)]
fix(features/compose): Handle external changes to the textarea (#3632)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 25 Jun 2017 19:42:55 +0000 (04:42 +0900)]
Cover Auth::RegistrationsController more (#3353)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 25 Jun 2017 19:42:36 +0000 (04:42 +0900)]
Cover Admin::DomainBlocksController more (#3329)
Also domain_block fabricator now sets unique domains
amazedkoumei [Sun, 25 Jun 2017 16:13:31 +0000 (01:13 +0900)]
more free pgconfig by .env (#3909)
* more free pgconfig for streaming by .env
* fix wrong default values
* database.yml read ENV as same as streaming server
Eugen Rochko [Sun, 25 Jun 2017 14:54:30 +0000 (16:54 +0200)]
Add overview of active sessions (#3929)
* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
PFM [Sun, 25 Jun 2017 14:02:56 +0000 (23:02 +0900)]
Fix "undefined" in className (#3939)
unarist [Sun, 25 Jun 2017 10:52:42 +0000 (19:52 +0900)]
Don't set ASSET_HOST on build:development (#3936)
Setting ASSET_HOST to `http://0.0.0.0:8080` makes urls in manifest.json to
be invalid, e.g. `http://0.0.0.0:8080/packs/application.js`.
Anyway, we don't need set this on build:development because assets would
be delivered from same origin in development (and w/o dev-server).
unarist [Sun, 25 Jun 2017 10:49:53 +0000 (19:49 +0900)]
Fix react-intl/locale-data import issue on production build (#3937)
Webpack seems to fail to import `react-intl/locale-data/*.js` if those
files has been proceed by babel, and this also breaks applying our translation.
Note that this won't be a problem on English locale, because react-intl
includes it as default and works fine without manually added locale-data.
Also this issue seems to only occurs on production build, but I'm not sure
about reason.
unarist [Sat, 24 Jun 2017 21:18:32 +0000 (06:18 +0900)]
Fix elephant in onboarding modal being very small sized on small devices (#3932)
unarist [Sat, 24 Jun 2017 21:18:11 +0000 (06:18 +0900)]
Clean column collapsible (#3931)
* Remove unused column_collapsable.js
* Remove old styles
* Extract `> div` style to independent class
Sorin Davidoi [Sat, 24 Jun 2017 21:17:39 +0000 (23:17 +0200)]
feat(components/onboarding_modal): Swipe between pages (#3934)
unarist [Sat, 24 Jun 2017 12:03:52 +0000 (21:03 +0900)]
Fix webpack config for Windows (#3926)
Yamagishi Kazutoshi [Sat, 24 Jun 2017 10:24:02 +0000 (19:24 +0900)]
Fix #3924 (regression from #3906) (#3925)
unarist [Sat, 24 Jun 2017 00:43:26 +0000 (09:43 +0900)]
Use debounce for dispatch scrollTopNotification and expandNotifications (#3700)
Daniel Hunsaker [Fri, 23 Jun 2017 21:13:27 +0000 (15:13 -0600)]
Fix a typo and give CW'd statuses the right cursor (#3918)
Eugen Rochko [Fri, 23 Jun 2017 17:40:51 +0000 (19:40 +0200)]
Fix webpack-dev-server until it's fixed upstream (#3916)
Yamagishi Kazutoshi [Fri, 23 Jun 2017 17:36:54 +0000 (02:36 +0900)]
Use Class and Property Decorators (#3730)
ref https://tc39.github.io/proposal-decorators/
Takuya Yoshida [Fri, 23 Jun 2017 17:22:02 +0000 (02:22 +0900)]
Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" (#3913)
* Fix errorMiddleware
* Add "eslint-disable-line no-unused-vars"
Sorin Davidoi [Fri, 23 Jun 2017 16:50:53 +0000 (18:50 +0200)]
Revocable sessions (#3616)
* feat: Revocable sessions
* fix: Tests using sign_in
* feat: Configuration entry for the maximum number of session activations
Nolan Lawson [Fri, 23 Jun 2017 16:21:33 +0000 (09:21 -0700)]
Apply babel to react-intl to remove prop-types (#3914)
Eugen Rochko [Fri, 23 Jun 2017 15:52:56 +0000 (17:52 +0200)]
Merge branch 'sorin-davidoi-swipe-gestures'
Eugen Rochko [Fri, 23 Jun 2017 15:52:39 +0000 (17:52 +0200)]
Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures
Akihiko Odaki (@fn_aki@pawoo.net) [Fri, 23 Jun 2017 15:46:00 +0000 (00:46 +0900)]
Add index statuses on account_id and id (#3895)
Nolan Lawson [Fri, 23 Jun 2017 15:44:55 +0000 (08:44 -0700)]
Upgrade to Webpack 3 with module concatenation (#3912)
Eugen Rochko [Fri, 23 Jun 2017 15:02:14 +0000 (17:02 +0200)]
Bump version to 1.4.6
Eugen Rochko [Fri, 23 Jun 2017 15:01:53 +0000 (17:01 +0200)]
Add important test for full-width hashtags (#3911)