me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3787 commits 2 branches 0 tags 429 MiB
Commit graph

2468 commits

Author SHA1 Message Date
beatrix
64a107bc64 Merge pull request #87 from tootsuite/master 
merge upstream
 2017-07-20 11:24:32 -04:00
kibigo!
46112b7cbe Restructured local settings internals 2017-07-19 20:41:28 -07:00
Eugen Rochko
75ab767791 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
2de75ba29d feat(css): Remove border radius from WebKit's scrollbars (#4278) 2017-07-20 00:20:54 +02:00
Sorin Davidoi
707d6fa9c0 fix(status_list): Update scroll position after toots are appended (#4277) 2017-07-19 22:38:26 +02:00
Sorin Davidoi
04ec8a8f38 fix(push_subscription): Guard against malformed favourite notification (#4271) 2017-07-19 22:37:52 +02:00
unarist
c44fcfd9e7 Update scroll top state on column mounting (#4276) 2017-07-19 20:26:51 +02:00
Sorin Davidoi
e6275b4ade fix: Handle errors without response (#4274) 2017-07-19 19:38:50 +02:00
Eugen Rochko
81ebd4025a Add ActivityPub attributes to accounts (#4273) 2017-07-19 17:06:46 +02:00
Akihiko Odaki
b085c55263 Fix logging in ProcessFeedService (#4270) 2017-07-19 16:02:03 +02:00
Eugen Rochko
df59dc6639 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
77c64924bc 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
8465019f54 i18n: Update Polish translation (#4268) 2017-07-19 12:25:06 +02:00
Eugen Rochko
7b610bea1b Fix deprecation warning for non-pipeline assets (#4267) 2017-07-19 12:00:05 +02:00
Yamagishi Kazutoshi
9392d10250 Add feature to revoke sessions (#4259) 2017-07-19 04:59:04 +02:00
Eugen Rochko
3852032953 Correct OStatus inflection (Ostatus -> OStatus) (#4255) 2017-07-19 01:37:26 +02:00
Sorin Davidoi
fa9c117921 feat(emoji): Add back title attribute (#4253) 2017-07-18 22:49:24 +02:00
kibigo!
0b64d60988 Fix for stylesheet split 2017-07-18 11:28:52 -07:00
Surinna Curtis
6311bfb8ff Add sourceRoot/includePaths to loaders 
Use the settings modal as an example/testcase
 2017-07-18 11:27:48 -07:00
lindwurm
b8db4f786a Update Japanese translation (chase #4249) (#4251) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 20:03:18 +02:00
m4sk1n
03644ac855 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
ed6c60a0c2 Merge changes from upstream with the CSS reload fix 2017-07-18 18:58:47 +02:00
lindwurm
9756975884 Add Japanese translation for #4246 (#4249) 
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-07-18 18:43:19 +02:00
lindwurm
7c0b509ba9 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 Kazutoshi
87bb16a236 Add unfollow modal (optional) (#4246) 
* Add unfollow modal

* unfollowing someone

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

This is a change same with 002ed7dc62, 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
e3251e74c1 Improve admin page (#4121) 
* Improve admin page

* Fix test

* Add spec

* Improve select style
 2017-07-18 16:38:22 +02:00
Sorin Davidoi
3d4ae604b8 fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226) 2017-07-18 16:25:40 +02:00
abcang
c5cd48bff7 Fixed issue that the NSFW image is not hidden on detail page (#4244) 2017-07-18 15:24:57 +02:00
Yamagishi Kazutoshi
fe4429446f Add empty alt attribute to img elements in landing page (#4243) 2017-07-18 15:22:09 +02:00
Yamagishi Kazutoshi
af027b6b30 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 Davidoi
49389c3809 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 Odaki
df2a07d354 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
713938f266 Updated from tootsuite 2017-07-17 20:03:57 +02:00
Lynx Kotoura
64202d0fcf 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 Odaki
6eff4496e3 Improve a query in WebPushNotificationWorker (#4234) 2017-07-17 11:03:48 +02:00
Akihiko Odaki
71a02eb2d9 Use update method to update session in WebPushNotificationWorker (#4235) 2017-07-17 11:03:42 +02:00
Sorin Davidoi
36d42f83f3 fix(emojis): Handle multipoint emojis (e.g. country flags) (#4221) 2017-07-17 10:57:45 +02:00
Eugen Rochko
b4b3bf7c12 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 Odaki
53cb659076 Require images in common.js (#4232) 2017-07-17 10:23:28 +02:00
Eugen Rochko
9aa9548884 Add public key declaration to actors (#4215) 2017-07-17 02:37:27 +02:00
kibigo!
fea6120855 Documentation and cleanup 2017-07-16 17:13:16 -07:00
kibigo!
32ef49a033 Fixes lack of <tbody> in header metadata table 2017-07-16 16:49:12 -07:00
Lynx Kotoura
160d0e1089 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 Rochko
f3ed02e492 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ška
02f16aea28 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!
803842f809 FIXED STUFF FROM THE MERGE SORRY ;_; 2017-07-15 15:42:39 -07:00
kibigo!
d5d6a8ad16 Ported updates from #64 2017-07-15 15:10:06 -07:00
kibigo!
f48f42598f Merge upstream (#81) 2017-07-15 14:33:15 -07:00
unarist
55313a0102 Fix column swiping (#4211) 
This fixes broken behavior and enable animation only on swiping.
 2017-07-15 17:25:04 +02:00