monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,202 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

5202 Commits

Author SHA1 Message Date
Thomas Leister 5d408fd9aa [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 47579ec58c 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 3363a05539 i18n: Update Polish translation (#4545) 2017-08-07 21:55:25 +09:00
Yamagishi Kazutoshi 87f10d476c 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! 70c5eccc12 Compatibility regex for user profiles 2017-08-06 15:10:06 -07:00
Eugen Rochko 41c3389d76 Bump to 1.5.1 2017-08-06 23:53:25 +02:00
Masoud Abkenar e7a5a188ef i18n: update Persian translation (#4540) 2017-08-06 23:50:20 +02:00
Ondřej Hruška eb7fc34708 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 b6bf04ece2 Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column 2017-08-06 21:27:47 +02:00
Ondřej Hruška 91836d577e Add data-avatar-of="@..." to all user avatars 2017-08-06 21:24:13 +02:00
Ondřej Hruška 7de0fa698d Updated glitch files to use the new Avatar class correctly 2017-08-06 21:23:59 +02:00
Ondřej Hruška 811d895f7b Merged upstream PR #4526 2017-08-06 21:23:36 +02:00
Komic 71384b2ef9 Fix #4531 (#4533) 
wrong character, sorry about that~
 2017-08-06 21:52:12 +09:00
Komic d1d465347a fr.yml update (#4531) 
Translation for https://github.com/tootsuite/mastodon/pull/4523
 2017-08-06 17:36:10 +09:00
Daigo 3 Dango 5eba129b0f Translate 'Signed in as' into Japanese (#4530) 2017-08-06 03:14:11 +02:00
Quent-in 021a83ead4 l10n OC - Added #4523 "signed in as" (#4529) 
Neutral form used.
 2017-08-06 08:10:53 +09:00
MitarashiDango 5ee45fa571 fix columns_area.js (#4528) 2017-08-05 20:33:41 +02:00
Eugen Rochko 61a06eb328 Update goldfinger to 2.0.1, see tootsuite/goldfinger#5 (#4527) 2017-08-05 15:29:52 +02:00
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
Quent-in 029786442a l10n update Occitan (#4522) 
Salutation mailer + invalid reset link.
 2017-08-05 01:31:27 +02:00
Ondřej Hruška 7b42d14f45 fix bug with data attrib for boost in home TL 2017-08-04 22:38:58 +02:00
Ondřej Hruška f34f33c19e 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 9d1f8b9d6a 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 400616813e Fix some mistakes in Polish translation (#4495) 2017-08-04 22:43:28 +09:00
Eugen Rochko 724be2d5fe Ignore some locale keys that can but do not need to be translated (#4515) 2017-08-04 04:42:28 +02:00
Jeroen 76da330155 Dutch strings: typo (#4489) 2017-08-04 07:16:25 +09:00
Yamagishi Kazutoshi ab60aa2266 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 0bbd5789b5 i18n: Update Polish translation (#4479) 
* i18n: Update Polish translation

* Update Polish translation
 2017-08-03 17:49:53 +02:00
Yamagishi Kazutoshi fae71b653a Enable cache for babel-loader (#4505) 2017-08-03 17:46:49 +02:00
nullkal dfcd2834f9 Redirect to PasswordController#new when reset_password_token is invalid (#4506) 2017-08-03 17:45:45 +02:00
MIYAGI Hikaru 09e86ef90b make number of comparison in emojify() fewer (#4500) 
fix style

"©"削除処理をemojione_lightに移動
 2017-08-02 21:05:17 +02:00
TheKinrar 9ba7d526a0 Don't normalize invalid domain names (#4499) 
Fixes #4496
 2017-08-02 14:54:33 +02:00
unarist 94e233e7b2 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 ac53736814 fix(status_list): Use correct keys for keyboard navigation (#4487) 2017-08-02 13:09:09 +02:00
Komic 8c0e78ae43 fr.json update (#4492) 2017-08-02 13:31:49 +09:00
asria-jp 26ab702304 Update Japanese Translation (authorize_follow) (#4481) 
* Update Japanese Translation

* preserve "Unfortunately"("残念ながら")

preserve "Unfortunately"("残念ながら")
 2017-08-02 11:49:25 +09:00
kibigo! 8b58153583 Fixed onClick column links 2017-08-01 13:46:52 -07:00
kibigo! 8150689b48 Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Quent-in 7ef8482568 l10n #4457 update for Occitan language (#4483) 
Previous and Next buttons
 2017-08-02 00:12:30 +09:00
Eugen Rochko 559fd08845 Bump to 1.5.0 2017-08-01 15:12:07 +02:00
Jeroen 202942a76f Update Dutch (nl) strings (#4480) 2017-08-01 15:00:41 +02:00
ScienJus c3e355388a Show SMTP_TLS in config sample (#4477) 2017-08-01 15:00:29 +02:00
Sorin Davidoi d4c4820c03 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 e05606c8d0 Change logo URL for Heroku and Scalingo (#4476) 2017-08-01 05:59:11 +02:00
Yamagishi Kazutoshi 161f72cce3 Add libidn11 to Aptfile (#4475) 
Fix builds that fail on Heroku.
 2017-08-01 05:58:08 +02:00
Yamagishi Kazutoshi 8ccb3b96ab Re-add outline (#4474) 
* Re-add outline

* respect default of web browser
 2017-08-01 01:40:31 +02:00
Ondřej Hruška e9ee249fd5 do not emojify tm, (R) and (C) (#4472) 2017-08-01 00:16:05 +02:00
Masoud Abkenar 4b6cd1dfdb i18n: update Persian translation (#4470) 
* i18n: update Persian translation

* i18n: fix quotes
 2017-07-31 19:40:57 +02:00
Yamagishi Kazutoshi b9ec3b7e7c Load extra polyfills when isIntersecting is undefined (#4469) 2017-07-31 19:40:20 +02:00
Eugen Rochko 9b247c3d88 Bump to 1.5.0rc3 2017-07-31 15:28:36 +02:00