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

6096 commits

This branch
This branch
All branches
Author SHA1 Message Date
beatrix
a7cd93032e Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js 
Add “public” pack to admin controller, as it is included in upstream …
 2018-03-30 14:50:19 -04:00
beatrix
766a008931 Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui 
Port #6628 to glitch-soc flavour
 2018-03-30 14:50:02 -04:00
David Yip
0f8f4969bd Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes 
Backport dropdown menu fixes from Mastodon
 2018-03-30 11:29:26 -05:00
David Yip
1612cbd150 Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page 
Fix migration page style
 2018-03-30 11:27:57 -05:00
Thibaut Girka
e282d19700 Add “public” pack to admin controller, as it is included in upstream admin layout 
Fixes CW unfolding in moderation
 2018-03-30 18:16:47 +02:00
Thibaut Girka
f7d23998c8 Fix migration page style 2018-03-30 15:26:12 +02:00
Thibaut Girka
769c536db4 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open 
Port 95fce1bca0 to glitch-soc
 2018-03-30 12:45:23 +02:00
Thibaut Girka
caa6611877 [Glitch] Place dropdown menu top if it is closer to the bottom of the viewport 
Port 27b532cc98 to glitch-soc
 2018-03-30 12:31:29 +02:00
Thibaut Girka
957d5c36c7 Add the domain blocks UI to Getting Started Misc 2018-03-30 10:07:33 +02:00
Thibaut Girka
d2b9747a50 Add basic domain block UI 2018-03-30 10:07:33 +02:00
Thibaut Girka
38feef43ad Keep list of blocked domains 
Might be overkill, but I'm trying to follow the same logic as for blocked users
 2018-03-30 10:07:33 +02:00
Thibaut Girka
e47593cac8 Update all known users' domain_blocking relationship instead of just one's 2018-03-30 10:07:33 +02:00
Thibaut Girka
876cc5c02b Fix undefined URL in fetchDomainBlocks 2018-03-30 10:07:33 +02:00
David Yip
bc51e7509b Merge pull request #404 from ThibG/glitch-soc/features/moved-note 
[Untested] [Glitch] Profile redirect notes
 2018-03-29 09:26:31 -05:00
Thibaut Girka
32ede640af [Glitch] Display unfollow button even if account moved 
Backport 1a90ef9c25 to glitch-soc
 2018-03-29 14:59:20 +02:00
Thibaut Girka
f63450c7ec [Glitch] Profile redirect notes 
Port WebUI changes from b89f614bd7
 2018-03-29 14:59:20 +02:00
David Yip
299cfa4bc7 Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents 
Render toots with empty contents
 2018-03-28 16:39:12 -05:00
David Yip
998a2eff76 Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup 
Fix attachment lists
 2018-03-28 16:38:53 -05:00
Thibaut Girka
166fe6e6dd Fix attachment lists 2018-03-28 22:19:36 +02:00
Thibaut Girka
4975cee02f Render toots with empty contents 
This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon.
 2018-03-28 21:13:45 +02:00
David Yip
e6e537d002 Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter 
Remove ignored 'u' parameter on regexp (#392)
 2018-03-27 13:06:28 -05:00
David Yip
2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
David Yip
1bf0a6548c Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-03-27 10:41:18 -05:00
Rey Tucker
b65fc60334 Remove ignored 'u' parameter on regexp (#392) 2018-03-27 11:30:49 -04:00
David Yip
7cdf2b05b6 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb
 2018-03-27 10:26:47 -05:00
David Yip
9f55021e7e Merge pull request #399 from ThibG/glitch-soc/features/attachments-list 
Port attachment lists to glitch-soc flavour
 2018-03-27 10:20:52 -05:00
unarist
2111defbbf Fix LoadMore on account media gallery (#6933) 
max_id in the fetch request should be a status id, but media attachment id was used.
 2018-03-27 16:53:52 +02:00
Thibaut Girka
8fc7f85356 [Glitch] Display AttachmentList in notifications 
Port 2cb19bf443 to glitch-soc
 2018-03-27 16:09:33 +02:00
Thibaut Girka
9454cfc0ad [Glitch] Display AttachmentList in timelines in compact style when media missing 
Port 5079c1e322 to glitch-soc
 2018-03-27 16:09:27 +02:00
unarist
cfd1fe74c9 Clone response before put it to the cache (#6932) 
`Response.prototype.clone()` must be called before the response used.

This fixes an error from ServiceWorker and failing to load image when the
image is not cached.
 2018-03-27 15:18:35 +02:00
unarist
9487e8a4c0 Add missing null handling in notification reducer (#6930) 
This patch adds null item (i.e. gap) handling on below functions to avoid TypeError.

* `filterNotifications` called on user mute/block
* `deleteByStatus` called on status deletion
 2018-03-27 13:05:59 +02:00
Akihiko Odaki
e829c21cc6 Cache media (#6902) 2018-03-27 12:32:30 +02:00
Yuto Tokunaga
5eea3f9877 fix #6846 (#6914) 2018-03-27 12:30:28 +02:00
unarist
0fb7252ac4 Add a spec for UniqueUsernameValidator (#6927) 
Note that this spec has a pending test about dots in the username,
because allowing it has been reverted for now.
 2018-03-27 05:22:58 +02:00
Eugen Rochko
ebba6fb7f5 Fix UniqueUsernameValidator comparison (#6926) 
Comparison was downcasing only one side, therefore if previously
existing account had a non-lowercase spelling, it would be ignored
when checking for duplicates.

New rake task `mastodon:maintenance:find_duplicate_usernames` will
help find constraint violations that might have occured from the
presence of this bug.

Bump version to 2.3.3
 2018-03-27 04:33:57 +02:00
Akihiko Odaki
acece7a2e6 Validate HTTP response length while receiving (#6891) 
to_s method of HTTP::Response keeps blocking while it receives the whole
content, no matter how it is big. This means it may waste time to receive
unacceptably large files. It may also consume memory and disk in the
process. This solves the inefficency by checking response length while
receiving.
 2018-03-26 14:02:10 +02:00
Stephen Burgess
f9e88856e3 feat(ShowMore): Add classname to show more/show less button (#6904) 2018-03-26 13:59:44 +02:00
Yuto Tokunaga
480131a376 Refactor scss (#6913) 
* Refactoring scss

introduce scss variables for the media modal
fix css block structure corresponding to react components
fix flex layouts
remove background image of the loaded image on the media modal

* Fix typo
 2018-03-26 13:59:21 +02:00
Jenkins
43a16782ef Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-26 11:17:19 +00:00
unarist
351203118c Fix moved account handling in IndexedDB feature (#6915) 
* Fix stack overflow on importFetchedAccounts

  When the account has moved property, it should process destination
  account instead of source account itself.

* Set account id instead of account object for moved property

  This restores "foo has moved to" indication on account view, and
  fixes `reblog` index on `accounts` object store.
 2018-03-26 12:48:01 +02:00
Yann Klis
740f44ecc4 Missing OTP_SECRET in scalingo.json (#6917) 2018-03-26 12:47:34 +02:00
Jenkins
ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
Marcin Mikołajczak
29dfe740f6 i18n: Update Polish translation (#6903) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-03-25 23:33:07 +09:00
Akihiko Odaki
9eaa47845c Allow clients to fetch notifications made while they were offline (#6886) 2018-03-24 22:07:23 +01:00
Akihiko Odaki
34cb1a5461 Allow clients to fetch statuses made while they were offline (#6876) 2018-03-24 15:25:15 +01:00
Akihiko Odaki
42786040d1 Rename variables to have semantic meanings in notifications reducer (#6890) 2018-03-24 13:36:44 +01:00
Akihiko Odaki
43f2b0281d Store objects to IndexedDB (#6826) 2018-03-24 13:06:27 +01:00
Yamagishi Kazutoshi
6daa722e87 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) 
This reverts commit d35272245e.
 2018-03-24 12:52:45 +01:00
Akihiko Odaki
47d2277ef1 Show media modal on public pages (#6801) 2018-03-24 12:52:26 +01:00
Marcin Mikołajczak
3386112fb1 Change “Toots with replies” to “Toots and replies” (#6875) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-03-24 12:51:51 +01:00