Ondřej Hruška
913dd13575
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
Ondřej Hruška
46a9e9d7ea
always put @handles on a new line. undo some needless changes from prev cmmt
2017-08-07 21:59:49 +02:00
Ondřej Hruška
782f21ca4b
removed ellipsis from .display-name
2017-08-07 21:24:19 +02:00
Lynx Kotoura
bac2a77deb
Adjust tags and accounts page ( #4534 )
...
* Adjust tag and accounts page
* Remove units from 0px paddings
2017-08-07 20:33:06 +02:00
Sorin Davidoi
ed7abec8f5
feat: Cache status height to avoid expensive renders ( #4439 )
...
* feat: Cache status height to avoid expensive renders
* feat: Escape content and emojify in reducers
* fix(css): Remove backface-visibility: hidden from .scrollable
* fix(statuses): Avoid creating DOMParses inside a loop
2017-08-07 20:32:03 +02:00
Ondřej Hruška
199affb141
Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc ( #4526 )
...
* Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop.
Also removed animate attribute from compose navigation bar, which should
have never been there. Added test for avatar overlay.
* fix broken tests
* god dammit another bug in tests! travis please let this pass
* formatting in avatar overlay
2017-08-07 19:44:55 +02:00
Yamagishi Kazutoshi
4e7e54ace5
Update dependencies for Ruby ( #4543 )
...
* Update twitter-text to version 1.14.7
* Update tilt to version 2.0.8
* Update statsd-instrument to version 2.1.4
* Update sidekiq to version 5.0.4
* Update sidekiq-scheduler to version 2.1.8
* Update sidekiq-unique-jobs to version 5.0.9
* Update redis-activesupport to version 5.0.3
* Update rails-settings-cached to version v0.6.6
* Update pkg-config to version 1.2.4
* Update parallel_tests to version 2.14.2
* Update jsonapi-renderer to version 0.1.3
* Update i18n-tasks to version 0.9.16
* Update httplog to version 0.99.7
* Update fabrication to version 2.16.2
* Update bootsnap to version 1.1.2
* Update aws-sigv4 to version 1.0.1
* Update aws-sdk-core to version 2.10.21
* Update hashdiff to version 0.3.5
* Update rails to version 5.1.3
2017-08-07 18:55:36 +02:00
Thomas Leister
672083c50b
[Docker] Add multicore support to "make" and "bundler" ( #4544 )
...
* Let make and bundler use multiple cores
* Adds -j option to bundle install instead of bundle config
2017-08-07 18:55:07 +02:00
m4sk1n
f127f72d44
It makes no sense to try using invalid or expired link again ( #4521 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-08-08 00:20:21 +09:00
m4sk1n
8e80cea3e4
i18n: Update Polish translation ( #4545 )
2017-08-07 21:55:25 +09:00
Yamagishi Kazutoshi
730fa0a06b
Set false to animated options for thumbnail processor ( #4547 )
...
Resolve #3199
Fix the aspect ratio of animated GIF whose background is transparent.
2017-08-07 14:41:21 +02:00
kibigo!
87eba9e667
Compatibility regex for user profiles
2017-08-06 15:10:06 -07:00
Eugen Rochko
1a8295b5ca
Bump to 1.5.1
2017-08-06 23:53:25 +02:00
Masoud Abkenar
50c089d5ca
i18n: update Persian translation ( #4540 )
2017-08-06 23:50:20 +02:00
Ondřej Hruška
e021f32556
Merge pull request #124 from glitch-soc/data-avatar-of
...
all checks have failed woooooo \*merges*
2017-08-06 21:49:26 +02:00
Ondřej Hruška
9e25723414
Add data-avatar-of="@..." to all user avatars
2017-08-06 21:24:13 +02:00
Ondřej Hruška
95314d6854
Updated glitch files to use the new Avatar class correctly
2017-08-06 21:23:59 +02:00
Ondřej Hruška
e11cd9b141
Merged upstream PR #4526
2017-08-06 21:23:36 +02:00
Komic
ef3c046936
Fix #4531 ( #4533 )
...
wrong character, sorry about that~
2017-08-06 21:52:12 +09:00
Komic
9003065063
fr.yml update ( #4531 )
...
Translation for https://github.com/tootsuite/mastodon/pull/4523
2017-08-06 17:36:10 +09:00
Daigo 3 Dango
3f59c8a7d1
Translate 'Signed in as' into Japanese ( #4530 )
2017-08-06 03:14:11 +02:00
Quent-in
74eba690f9
l10n OC - Added #4523 "signed in as" ( #4529 )
...
Neutral form used.
2017-08-06 08:10:53 +09:00
MitarashiDango
ad1065cbc5
fix columns_area.js ( #4528 )
2017-08-05 20:33:41 +02:00
Eugen Rochko
50cc4ee027
Update goldfinger to 2.0.1, see tootsuite/goldfinger#5 ( #4527 )
2017-08-05 15:29:52 +02:00
Eugen Rochko
fd69694749
Add "signed in as" header to some pages ( #4523 )
2017-08-05 04:24:58 +02:00
Quent-in
aa1772de1e
l10n update Occitan ( #4522 )
...
Salutation mailer + invalid reset link.
2017-08-05 01:31:27 +02:00
Ondřej Hruška
9d03c77d0f
fix bug with data attrib for boost in home TL
2017-08-04 22:38:58 +02:00
Ondřej Hruška
6c783a25c2
Add data- attributes to statuses for userstyle selectors ( #117 )
...
* Add data- attributes to statuses for userstyle selectors
* use const and template string, replace reblog->boosted and favourite->favourited
* more template strings because sorin-sama said so
2017-08-04 22:11:46 +02:00
Akihiko Odaki
c4a21aa352
Scroll columns area to right when children property is changed ( #4517 )
...
The feature to pin column could hide the rightmost column, which is
specified with children property of ColumnsArea.
The user is likely to see the column when the property changed, so scroll
the area in such cases.
2017-08-04 18:57:46 +02:00
Krzysztof Jurewicz
e55ecdf48f
Fix some mistakes in Polish translation ( #4495 )
2017-08-04 22:43:28 +09:00
Eugen Rochko
33985f8020
Ignore some locale keys that can but do not need to be translated ( #4515 )
2017-08-04 04:42:28 +02:00
Jeroen
fea7c275b2
Dutch strings: typo ( #4489 )
2017-08-04 07:16:25 +09:00
Yamagishi Kazutoshi
e28c4f29c0
Use GNU libiconv in Nokogiri ( #4494 )
...
System default libiconv of Alpine Linux only supports some charset (e.g. UTF-8).
Therefore, the preview card of the page which is not UTF-8 will be broken in the Docker environment.
Using GNU libiconv!
2017-08-03 18:04:36 +02:00
m4sk1n
45ed3ef755
i18n: Update Polish translation ( #4479 )
...
* i18n: Update Polish translation
* Update Polish translation
2017-08-03 17:49:53 +02:00
Yamagishi Kazutoshi
581f8b2909
Enable cache for babel-loader ( #4505 )
2017-08-03 17:46:49 +02:00
nullkal
62b92a4c0a
Redirect to PasswordController#new when reset_password_token is invalid ( #4506 )
2017-08-03 17:45:45 +02:00
MIYAGI Hikaru
a1db03b345
make number of comparison in emojify() fewer ( #4500 )
...
fix style
"©"削除処理をemojione_lightに移動
2017-08-02 21:05:17 +02:00
TheKinrar
a62b6a4f12
Don't normalize invalid domain names ( #4499 )
...
Fixes #4496
2017-08-02 14:54:33 +02:00
unarist
465aaedbcf
Fix column-back-button style for some browsers ( #4484 )
...
Use `text-align: unset` instead of `text-align: start` which Edge doesn't support for now.
Also remove default margin on Safari.
2017-08-02 13:09:37 +02:00
Sorin Davidoi
9fc6c974f6
fix(status_list): Use correct keys for keyboard navigation ( #4487 )
2017-08-02 13:09:09 +02:00
Komic
0c10b35c11
fr.json update ( #4492 )
2017-08-02 13:31:49 +09:00
asria-jp
6bb6c2393b
Update Japanese Translation (authorize_follow) ( #4481 )
...
* Update Japanese Translation
* preserve "Unfortunately"("残念ながら")
preserve "Unfortunately"("残念ながら")
2017-08-02 11:49:25 +09:00
kibigo!
aa6e24bf44
Fixed onClick column links
2017-08-01 13:46:52 -07:00
kibigo!
2cdee6ae8a
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Quent-in
b516afc42c
l10n #4457 update for Occitan language ( #4483 )
...
Previous and Next buttons
2017-08-02 00:12:30 +09:00
Eugen Rochko
ace8b7cb1a
Bump to 1.5.0
2017-08-01 15:12:07 +02:00
Jeroen
765dbd296f
Update Dutch (nl) strings ( #4480 )
2017-08-01 15:00:41 +02:00
ScienJus
ea264f848f
Show SMTP_TLS in config sample ( #4477 )
2017-08-01 15:00:29 +02:00
Sorin Davidoi
d8f78827a4
fix(web_push_notifications): Send message with welcome notifications ( #4471 )
...
* fix(web_push_notifications): Send grouping title in welcome notification
* fix(web_push_notifications): Read message from last notification
2017-08-01 06:00:13 +02:00
Yamagishi Kazutoshi
d467afff43
Change logo URL for Heroku and Scalingo ( #4476 )
2017-08-01 05:59:11 +02:00