tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,787 Commits 10 Branches 0 Tags
e7edb4d1eeba6c12a1c71271faa30d2bbf00d054
Commit Graph
2468 Commits
Author SHA1 Message Date
beatrixandGitHub 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 RochkoandGitHub 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 DavidoiandEugen Rochko f24b81e27f feat(css): Remove border radius from WebKit's scrollbars (#4278) 2017-07-20 00:20:54 +02:00
Sorin DavidoiandEugen Rochko e01966f7b8 fix(status_list): Update scroll position after toots are appended (#4277) 2017-07-19 22:38:26 +02:00
Sorin DavidoiandEugen Rochko dcb9497148 fix(push_subscription): Guard against malformed favourite notification (#4271) 2017-07-19 22:37:52 +02:00
unaristandEugen Rochko 4f2513337f Update scroll top state on column mounting (#4276) 2017-07-19 20:26:51 +02:00
Sorin DavidoiandEugen Rochko 015269914e fix: Handle errors without response (#4274) 2017-07-19 19:38:50 +02:00
Eugen RochkoandGitHub bbdcfd6baf Add ActivityPub attributes to accounts (#4273) 2017-07-19 17:06:46 +02:00
Akihiko OdakiandEugen Rochko f0d6550f16 Fix logging in ProcessFeedService (#4270) 2017-07-19 16:02:03 +02:00
Eugen RochkoandGitHub 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
CygnanandEugen Rochko 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
m4sk1nandEugen Rochko cdc349a2d1 i18n: Update Polish translation (#4268) 2017-07-19 12:25:06 +02:00
Eugen RochkoandGitHub c2c93f8cd6 Fix deprecation warning for non-pipeline assets (#4267) 2017-07-19 12:00:05 +02:00
Yamagishi KazutoshiandEugen Rochko 716f4cb11c Add feature to revoke sessions (#4259) 2017-07-19 04:59:04 +02:00
Eugen RochkoandGitHub a5a07da892 Correct OStatus inflection (Ostatus -> OStatus) (#4255) 2017-07-19 01:37:26 +02:00
Sorin DavidoiandEugen Rochko 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 Curtisandkibigo! 7a77f7b3bb Add sourceRoot/includePaths to loaders 
Use the settings modal as an example/testcase
 2017-07-18 11:27:48 -07:00
lindwurmandEugen Rochko 767117f9b0 Update Japanese translation (chase #4249) (#4251) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 20:03:18 +02:00
m4sk1nandEugen Rochko 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 d69fa9e1f4 Merge changes from upstream with the CSS reload fix 2017-07-18 18:58:47 +02:00
lindwurmandEugen Rochko 0b4006fc47 Add Japanese translation for #4246 (#4249) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 18:43:19 +02:00
lindwurmandEugen Rochko 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
Yamagishi KazutoshiandEugen Rochko 3267e4a785 Add unfollow modal (optional) (#4246) 
* Add unfollow modal

* unfollowing someone

* remove unnecessary prop
 2017-07-18 17:14:43 +02:00
Akihiko OdakiandEugen Rochko 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
abcangandEugen Rochko 4d42a38954 Improve admin page (#4121) 
* Improve admin page

* Fix test

* Add spec

* Improve select style
 2017-07-18 16:38:22 +02:00
Sorin DavidoiandEugen Rochko 8387b3928e fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226) 2017-07-18 16:25:40 +02:00
abcangandEugen Rochko afa52e4d63 Fixed issue that the NSFW image is not hidden on detail page (#4244) 2017-07-18 15:24:57 +02:00
Yamagishi KazutoshiandEugen Rochko 8949aad030 Add empty alt attribute to img elements in landing page (#4243) 2017-07-18 15:22:09 +02:00
Yamagishi KazutoshiandEugen Rochko 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
Sorin DavidoiandEugen Rochko 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
Akihiko OdakiandEugen Rochko b11ac88692 Require any modules after loading polyfill in entry points (#4231) 
app/javascript/mastodon/main.js delayed the execution of modules,
but other entry points didn't. That leads to failure in executing
modules, which requires those polyfills.

Strictly enforce the rule to require any modules after loading
polyfill in entry points.
 2017-07-18 00:19:02 +02:00
Ondřej Hruška c727eae441 Updated from tootsuite 2017-07-17 20:03:57 +02:00
Lynx KotouraandEugen Rochko 681c33d1f4 Quit overwriting style of extended-video-player (#4237) 
Though size of extended-video-player is already fixed to 80vw*80vh in components.scss, player size was also set to original video size in extended_video_player.js. Video size is fixed to 80vw*80vh, so video player's size must also be fixed to 80vw*80vh.
 2017-07-17 19:05:29 +02:00
Akihiko OdakiandEugen Rochko 7f35947d8e Improve a query in WebPushNotificationWorker (#4234) 2017-07-17 11:03:48 +02:00
Akihiko OdakiandEugen Rochko 68941d4dfa Use update method to update session in WebPushNotificationWorker (#4235) 2017-07-17 11:03:42 +02:00
Sorin DavidoiandEugen Rochko 1d2616b79b fix(emojis): Handle multipoint emojis (e.g. country flags) (#4221) 2017-07-17 10:57:45 +02:00
Eugen RochkoandGitHub d4b097a88c Add missing ActivityPub representations (#4230) 
- Follow, undo follow
- Accept follow, reject follow
- Like, undo like
- Block, undo block
- Delete (note)
- Update (actor)
 2017-07-17 10:57:04 +02:00
Akihiko OdakiandEugen Rochko b15f790221 Require images in common.js (#4232) 2017-07-17 10:23:28 +02:00
Eugen RochkoandGitHub a47c2e8890 Add public key declaration to actors (#4215) 2017-07-17 02:37:27 +02:00
kibigo! d0aad1ac85 Documentation and cleanup 2017-07-16 17:13:16 -07:00
kibigo! 21b04af524 Fixes lack of <tbody> in header metadata table 2017-07-16 16:49:12 -07:00
Lynx KotouraandEugen Rochko d1c3e35d3f Fix style settings for images in media modal (#4220) 
* Shrink too wide single image modal

Fix too wide react-swipeable-view-container

Fix 0067f80 shrinking all react-swipeable-view-container

Change to apply max-width of react-swipeable-view-container only under media-modal.

Fix b30b03b just a typo

* Centering contents in image-loader

Centering small img, canvas, and video in image-loader.
 2017-07-16 11:52:11 +02:00
Eugen RochkoandGitHub a6328fc1b1 Minor ActivityPub JSON fixes (#4214) 
- Objects must have attributedTo instead of actor
- The current attribute belongs to CollectionPage, not Collection
 2017-07-16 10:28:55 +02:00
Ondřej HruškaandGitHub 3ea02314b9 split added glitch locales from vanilla (#82) 
* Locale script now accepts overrides and new keys from glitch/locales

* Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts
 2017-07-16 01:15:25 +02:00
kibigo! 4715161a93 FIXED STUFF FROM THE MERGE SORRY ;_; 2017-07-15 15:42:39 -07:00
kibigo! bc4202d00b Ported updates from #64 2017-07-15 15:10:06 -07:00
kibigo! 09cfc079b0 Merge upstream (#81) 2017-07-15 14:33:15 -07:00
unaristandEugen Rochko 695439775e Fix column swiping (#4211) 
This fixes broken behavior and enable animation only on swiping.
 2017-07-15 17:25:04 +02:00