fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-16 03:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
4296 commits 128 branches 266 tags 975 MiB
Commit graph

4296 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yamagishi Kazutoshi d4c6bf770d Run bundle (regression from #4284) (#4290) 2017-07-21 14:22:05 +02:00
Eugen Rochko 399f9f4a4e Update Goldfinger gem to 2.0 (#4286) 
- No masking of HTTP::Error and OpenSSL::SSL::SSLError
- No longer accepts non-HTTPS WebFinger endpoints
 2017-07-21 13:40:48 +02:00
Yamagishi Kazutoshi f2390e2803 Dynamicaly change avatar and header bg from account setting (#4289) 2017-07-21 12:47:16 +02:00
Eugen Rochko dbaa6a0e13 Fix intermittent test failures due to accidentally reused class instance between threads (#4287) 2017-07-21 12:45:13 +02:00
Eugen Rochko 7bf7ed6123 Fix #3220 - Show avatar/header on edit profile page (#4288) 2017-07-21 05:28:51 +02:00
Eugen Rochko a390abdefb Use the same emoji data on the frontend and backend (#4284) 
* Use the same emoji data on the frontend and backend

* Move emoji.json to repository, add tests

This way you don't need to install node dependencies if you only
want to run Ruby code
 2017-07-21 04:27:40 +02:00
Sorin Davidoi c1bc5e14eb feat(compose): More space on mobile devices (#4282) 
* feat(compose): More space on mobile devices

* feat(compose): Hide navigation when typing on mobile devices

* fix(compose): Make animation faster

* fix(navigation_bar): Remove hardcoded title

* fix(compose): Prevent accidental bluring

* fix(compose): Increase max-height to 600px
 2017-07-21 01:38:24 +02:00
beatrix 0efd7e7406 disable about page timeline 2017-07-20 17:26:00 -04:00
Eugen Rochko 4b911fea03 Add button to re-subscribe to all accounts from a domain (#4285) 2017-07-20 23:07:13 +02:00
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master 
merge upstream
 2017-07-20 11:24:32 -04:00
kibigo! d235224692 Restructured local settings internals 2017-07-19 20:41:28 -07:00
Eugen Rochko 1fcdaafa6f Fix webfinger retries (#4275) 
* Do not raise unretryable exceptions in ResolveRemoteAccountService

* Removed fatal exceptions from ResolveRemoteAccountService

Exceptions that cannot be retried should not be raised. New exception
class for those that can be retried (Mastodon::UnexpectedResponseError)
 2017-07-20 01:59:07 +02:00
Sorin Davidoi f24b81e27f feat(css): Remove border radius from WebKit's scrollbars (#4278) 2017-07-20 00:20:54 +02:00
Sorin Davidoi e01966f7b8 fix(status_list): Update scroll position after toots are appended (#4277) 2017-07-19 22:38:26 +02:00
Sorin Davidoi dcb9497148 fix(push_subscription): Guard against malformed favourite notification (#4271) 2017-07-19 22:37:52 +02:00
unarist 4f2513337f Update scroll top state on column mounting (#4276) 2017-07-19 20:26:51 +02:00
Sorin Davidoi 015269914e fix: Handle errors without response (#4274) 2017-07-19 19:38:50 +02:00
Eugen Rochko bbdcfd6baf Add ActivityPub attributes to accounts (#4273) 2017-07-19 17:06:46 +02:00
Akihiko Odaki f0d6550f16 Fix logging in ProcessFeedService (#4270) 2017-07-19 16:02:03 +02:00
Eugen Rochko 8400bee3b1 Refactor ResolveRemoteAccountService (#4258) 
* Refactor ResolveRemoteAccountService

* Remove trailing whitespace

* Use redis locks around critical ResolveRemoteAccountService code

* Add test for race condition of lock
 2017-07-19 14:44:04 +02:00
Cygnan bc1f9dc24b Fix a typo in public.js (double semicolons) (#4269) 
Signed-off-by: Cygnan <mail@cygnan.com>
 2017-07-19 13:35:22 +02:00
m4sk1n cdc349a2d1 i18n: Update Polish translation (#4268) 2017-07-19 12:25:06 +02:00
Eugen Rochko c2c93f8cd6 Fix deprecation warning for non-pipeline assets (#4267) 2017-07-19 12:00:05 +02:00
m4sk1n 9fc082ea81 i18n: @716f4cb (pl) (#4266) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-07-19 10:49:36 +02:00
Damien Erambert 4c7a9adb98 fix missing closing <p> tag in ToS in en.yml (#4262) 2017-07-19 09:43:46 +02:00
m4sk1n 030e5cec58 Fix missing closing <p> tag in ToS in .yml files (#4264) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-07-19 09:43:10 +02:00
Yamagishi Kazutoshi 716f4cb11c Add feature to revoke sessions (#4259) 2017-07-19 04:59:04 +02:00
Eugen Rochko a5a07da892 Correct OStatus inflection (Ostatus -> OStatus) (#4255) 2017-07-19 01:37:26 +02:00
Sorin Davidoi 72108b20e2 feat(emoji): Add back title attribute (#4253) 2017-07-18 22:49:24 +02:00
kibigo! 0a678cf377 Fix for stylesheet split 2017-07-18 11:28:52 -07:00
Surinna Curtis 7a77f7b3bb Add sourceRoot/includePaths to loaders 
Use the settings modal as an example/testcase
 2017-07-18 11:27:48 -07:00
lindwurm 767117f9b0 Update Japanese translation (chase #4249) (#4251) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 20:03:18 +02:00
m4sk1n fb7f06a752 i18n: Update Polish translation (#4252) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-07-18 20:03:06 +02:00
Ondřej Hruška df74e26baf Merge branch 'tootsuite-master' 2017-07-18 18:59:00 +02:00
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix 2017-07-18 18:58:47 +02:00
lindwurm 0b4006fc47 Add Japanese translation for #4246 (#4249) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 18:43:19 +02:00
lindwurm 0ccd47f413 Update Japanese translations for new landing page (#4159) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 18:42:59 +02:00
Ondřej Hruška 02f896c12e Fix broken CSS reload due to webpack upgrade (#4250) 2017-07-18 18:42:45 +02:00
unarist bb4c3831b2 Add Japanese translation for #4199 (#4247) 2017-07-18 17:23:35 +02:00
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246) 
* Add unfollow modal

* unfollowing someone

* remove unnecessary prop
 2017-07-18 17:14:43 +02:00
Akihiko Odaki 89b988cab5 Introduce Ostatus name space (#4164) 
* Wrap methods of ProcessFeedService::ProcessEntry in classes

This is a change same with 425acecfdb, except
that it has the following changes:

* Revert irrelevant change in find_or_create_conversation
* Fix error handling for RemoteActivity

* Introduce Ostatus name space
 2017-07-18 16:39:47 +02:00
abcang 4d42a38954 Improve admin page (#4121) 
* Improve admin page

* Fix test

* Add spec

* Improve select style
 2017-07-18 16:38:22 +02:00
Sorin Davidoi 8387b3928e fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226) 2017-07-18 16:25:40 +02:00
abcang afa52e4d63 Fixed issue that the NSFW image is not hidden on detail page (#4244) 2017-07-18 15:24:57 +02:00
Yamagishi Kazutoshi 8949aad030 Add empty alt attribute to img elements in landing page (#4243) 2017-07-18 15:22:09 +02:00
Yamagishi Kazutoshi c0c7af2194 Download npm and yarn from Alpine packages repository (#4242) 2017-07-18 15:21:30 +02:00
Yamagishi Kazutoshi f5382ec085 Exclude self toots from regular expression filter (#4245) 
* Exclude self toots from regular expression filter

* refactor
 2017-07-18 15:20:38 +02:00
Yamagishi Kazutoshi 407073d7a2 Move icu-dev to build-dependencies (#4240) 2017-07-18 15:19:49 +02:00
Yamagishi Kazutoshi 7f4375822a Install libidn11-dev in Vagrant (#4238) 2017-07-18 00:31:43 +02:00
Sorin Davidoi 719ab720a7 feat(push-notifications): Open link in current tab if possible (#4228) 
* fix(push-notification): Open link in current tab if possible

* feat(sw): Skip waiting and claim clients
 2017-07-18 00:19:17 +02:00