tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
6,257 Commits 20 Branches 113 Tags 222 MiB
ed17e173d6
Commit Graph

6257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins
f0bb3ff533 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00
beatrix
01bad04efd
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
3304cb681d
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
257146c960
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
9248d1e3a7
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
b305e7452a 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
ThibG
e573bb0990 Fix compatibility with PeerTube (#6968) 
* Support fetching objects of convertible types by URL (fixes #6924)

* Ignore invalid hashtags
 2018-03-30 15:44:54 +02:00
Thibaut Girka
167a2ecde0 Fix migration page style 2018-03-30 15:26:12 +02:00
Thibaut Girka
48bcf4d6e8 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open 
Port 913a38111f to glitch-soc
 2018-03-30 12:45:23 +02:00
ThibG
a6c129ddbd Add some UI for user-defined domain blocks (#6628) 
* Keep list of blocked domains

Might be overkill, but I'm trying to follow the same logic as for blocked users

* Add basic domain block UI

* Add the domain blocks UI to Getting Started

* Fix undefined URL in `fetchDomainBlocks`

* Update all known users' domain_blocking relationship instead of just one's
 2018-03-30 12:38:00 +02:00
Thibaut Girka
2871a82fcc [Glitch] Place dropdown menu top if it is closer to the bottom of the viewport 
Port f6a8d835d3 to glitch-soc
 2018-03-30 12:31:29 +02:00
Thibaut Girka
218cc261d1 Add the domain blocks UI to Getting Started Misc 2018-03-30 10:07:33 +02:00
Thibaut Girka
afa813d71f Add basic domain block UI 2018-03-30 10:07:33 +02:00
Thibaut Girka
482ad7d7c4 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
79da0ad7a2 Update all known users' domain_blocking relationship instead of just one's 2018-03-30 10:07:33 +02:00
Thibaut Girka
937ace10d9 Fix undefined URL in fetchDomainBlocks 2018-03-30 10:07:33 +02:00
Pierre-Morgan Gate
47cee7cc8e Upgrade charlock_holmes to version 0.7.6 (#6966) 
This version fixes compilation errors when trying to build its native extension with ICU 61.
 2018-03-30 09:52:44 +02:00
takayamaki
947eedcab2 update ja locale (#6965) 
related https://github.com/tootsuite/mastodon/pull/6956
 2018-03-30 10:04:04 +09:00
Emelia Smith
d1f34151ae Feature: Direct message from menu (#6956) 
* Implement ability to send direct messages from the user menu

* Implement message warning users that direct messages are visible to all mentioned users

* Update locales
 2018-03-29 19:08:34 +02:00
David Yip
1bd12cf8eb
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
b5948044b3 [Glitch] Display unfollow button even if account moved 
Backport 3987bd18a4 to glitch-soc
 2018-03-29 14:59:20 +02:00
Thibaut Girka
a59c146bf8 [Glitch] Profile redirect notes 
Port WebUI changes from 58cede4808
 2018-03-29 14:59:20 +02:00
unarist
f1f846045f Fix ReferenceError when Cache API is missing (#6953) 
Cache API is not supported on Safari 11.0 / iOS 11.

Since those caching is optional, this patch simply ignores it.
 2018-03-29 14:57:02 +02:00
unarist
41452e8302 Fix TypeError on follow notification (#6950) 
`notification.status` may not be present, e.g. follow notification.
 2018-03-29 12:59:12 +02:00
ThibG
9ed5eebd7c Do not ignore unknown media attachments, only skip them (#6948) 
That way, they are displayed in a list below the corresponding toot.
 2018-03-29 00:52:24 +02:00
David Yip
4e45954280
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
d37a79adce
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
7db431eac6 Fix attachment lists 2018-03-28 22:19:36 +02:00
Thibaut Girka
53eab4470d 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
Yuto Tokunaga
5021c4e9ca Add double-tap zoom functionary to ZoomableImage (#6944) 
add <div.zoomable-image__margin/> to keep margin of the image on zooming
move setting `scrollLeft` and `scrollTop` of container from callback of
`setState` to `componentDidUpdate`
add 'hammerjs' package for touch gesture detection
rewrite `ZoomableImage` using 'hammerjs'
 2018-03-28 20:40:51 +02:00
Akihiko Odaki
4f9136d2d5 Document CORS requirement for asset host (#6941) 2018-03-28 20:40:18 +02:00
David Yip
1ed9500b52
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
d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
David Yip
49c957bc3b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-03-27 10:41:18 -05:00
Rey Tucker
21b586436e Remove ignored 'u' parameter on regexp (#392) 2018-03-27 11:30:49 -04:00
David Yip
f61aa8e0f7
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
6af17b79c5
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
3523aa440b 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
88790b91de [Glitch] Display AttachmentList in notifications 
Port 77406d3a09 to glitch-soc
 2018-03-27 16:09:33 +02:00
Thibaut Girka
3bc5452449 [Glitch] Display AttachmentList in timelines in compact style when media missing 
Port 86a9de6753 to glitch-soc
 2018-03-27 16:09:27 +02:00
unarist
f5ed5f3860 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
2f3ac14a43 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
ca42f9b0eb Cache media (#6902) 2018-03-27 12:32:30 +02:00
Yuto Tokunaga
31e7b73084 fix #6846 (#6914) 2018-03-27 12:30:28 +02:00
unarist
a1d0915585 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
2a90da1837
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
40e5d2303b 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
18965cb0e6 feat(ShowMore): Add classname to show more/show less button (#6904) 2018-03-26 13:59:44 +02:00
Yuto Tokunaga
f691afaae9 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
db3be77890 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-26 11:17:19 +00:00