treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
3,771 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

3771 Commits (4162b7e77238fed17d06a9178a257d74d956cddc)

Author SHA1 Message Date
のら 8442a1ae31 Update Japanese translation (#4051) 2017-07-03 11:02:59 +02:00
Nolan Lawson 28da1d54d5 Faster emojify() by avoiding str.replace() entirely (#4049) 2017-07-03 11:02:36 +02:00
Ratmir Karabut 48e8f704c8 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)
 2017-07-03 01:30:22 +02:00
Damien Erambert 21239abcf4 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
 2017-07-02 18:36:35 +02:00
Sorin Davidoi 214090aa4d fix(components/columns_area): Increase delta for swipe detection (#4037) 2017-07-02 15:55:50 +02:00
unarist 03d1dc655d Update Japanese translation (Credentials -> Security) (#4025) 2017-07-01 21:18:38 +02:00
Eugen Rochko 6bd8a23131 Fix height issue in report modal 2017-07-01 14:50:10 +02:00
Nolan Lawson ef21f8bc7e Faster emojify() algorithm, avoid regex replace (#4019) 
* Faster emojify() algorithm, avoid regex replace

* add semicolon
 2017-06-30 17:29:22 +02:00
Matt Jankowski eb39fb7211 Add controller spec for manifests controller (#4003) 2017-06-30 13:43:34 +02:00
Nolan Lawson 144d13eb48 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
 2017-06-30 13:43:26 +02:00
Matt Jankowski 620618f7bc 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
 2017-06-30 13:42:04 +02:00
Yamagishi Kazutoshi bf6a184b0c Fix that AdminMailer does not send (#4012) 2017-06-30 13:40:43 +02:00
Yamagishi Kazutoshi b8a4d69f71 Remove babel-cli (#4011) 2017-06-30 13:40:14 +02:00
Yamagishi Kazutoshi c7cefc7556 Fix broken style in media gallery (regression from #3963) (#4014) 2017-06-30 13:40:00 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) aea653f05d Do not raise an error if PrecomputeFeed could not find any status (#4015) 2017-06-30 13:39:42 +02:00
abcang 41856d021b Rescue Addressable::URI::InvalidURIError at Remotable (#4017) 2017-06-30 13:38:36 +02:00
Yamagishi Kazutoshi be5eef7b68 Replace state to /web when root path (#4009) 2017-06-30 05:37:41 +02:00
Naoki Kosaka a48f7bdf28 Fix media-gallery, overflow is hidden. (#4008) 2017-06-30 05:37:17 +02:00
abcang 572513b0b0 rescue HTTP::ConnectionError (#3992) 2017-06-29 13:04:07 +02:00
Yamagishi Kazutoshi 022878b743 Upgrade jsdom to version 11.0.0 (#3994) 2017-06-29 13:03:03 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 4be3cf318d Cover Admin::AccountsController more (#3327) 2017-06-29 01:43:10 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) f2c73de856 Use multiple pairs for zadd in PrecomputeFeedService (#3990) 2017-06-29 01:25:31 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 05f73fbdab Reduce number of commands in FeedManager#trim (#3989) 2017-06-29 01:17:26 +02:00
Eugen Rochko b5c4671c76 Bump version to 1.4.7 2017-06-28 17:44:17 +02:00
Eugen Rochko e49dd75db7 Do not fail to create access token if superapp was never created (#3986) 2017-06-28 17:43:48 +02:00
Yamagishi Kazutoshi 7700d71f1e Add Japanese translations (#3985) 
ref #3929, #3935, #3949, #3981
 2017-06-28 16:45:21 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) fa7649409b Overwrite old statuses with reblogs in PrecomputeFeedService (#3984) 2017-06-28 14:50:23 +02:00
m4sk1n c7c8e145bd i18n: added email to activerecord.pl.yml (#3981) 2017-06-28 14:07:53 +02:00
m4sk1n 0e81dda101 i18n: Minor fix in devise.pl.yml (#3978) 2017-06-27 23:14:02 +02:00
m4sk1n a7547bd97f i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-06-27 23:10:43 +02:00
m4sk1n e88228f0eb i18n: E-mail notifications to admins about new reports (pl) (#3975) 2017-06-27 22:21:35 +02:00
m4sk1n f01327d859 i18n: Turn report screen into a modal (pl) (#3974) 2017-06-27 22:14:31 +02:00
Sorin Davidoi eea5c01a41 fix(components/status): Up & down jump due to content being added to the DOM (#3972) 2017-06-27 18:43:53 +02:00
Eugen Rochko 0d316bcfd2 Turn report screen into a modal (#3965) 2017-06-27 18:07:21 +02:00
Midgard 39b7512782 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".
 2017-06-27 14:22:36 +02:00
Debanshu Kundu 7142cd5e0f #1456 Added rake task to add a user. (#1482) 2017-06-27 14:18:53 +02:00
Sorin Davidoi d6006ecb4b Responsive images in media gallery (#3963) 
* feat(components/media_gallery): Responsive images

* fix(components/media_gallery): Link to image URL
 2017-06-27 13:46:37 +02:00
Yamagishi Kazutoshi 57a3bc1b4f 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
 2017-06-27 13:46:11 +02:00
Yamagishi Kazutoshi 8a9408b7c3 Maintain aspect ratio for preview image (#3966) 2017-06-27 13:43:53 +02:00
Yamagishi Kazutoshi 9127df69d3 Update Rails to v5.1.2 (#3968) 2017-06-27 13:41:03 +02:00
Eugen Rochko d0221b05bc Fix #1624 - Send e-mail notifications to admins about new reports (#3949) 2017-06-27 00:04:00 +02:00
ThibG b9e0e43128 Raise an error if salmon request response is unsatisfactory (#3960) 2017-06-26 19:39:58 +02:00
m4sk1n 196bd78b60 i18n: Updated Polish translation (#3956) 
* i18n: Updated Polish translation

* Update pl.yml
 2017-06-26 17:18:45 +02:00
m4sk1n f37382eb68 i18n: Warning to look into the spam folder (pl) (#3955) 2017-06-26 17:10:54 +02:00
Daniel Hunsaker b6d9cee287 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.
 2017-06-26 13:15:24 +02:00
Alda Marteau-Hardi 103f87f9ae Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952) 2017-06-26 13:04:36 +02:00
Yamagishi Kazutoshi 188098ce62 Stop using Babel with streaming server (#3950) 2017-06-26 04:49:39 +02:00
Takuya Yoshida 84d2df3ec6 Re-fix errorMiddleware (#3922) 2017-06-26 01:46:15 +02:00
unarist 104c7d7f96 Ignore DB_NAME for development env on streaming as well as rails side (#3948) 2017-06-26 01:45:50 +02:00
Eugen Rochko b90a44b6d0 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
 2017-06-25 23:51:46 +02:00