treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
3,558 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

376 Commits (29cb8849d2d2fb34a1d4bb52c57f54fcaae73240)

Author SHA1 Message Date
kibigo! d2deae630d Allow line-breaks in bio metadata 2017-06-27 16:20:35 -07:00
beatrix-bitrot cdcb74ffb6 Merge remote-tracking branch 'upstream/master' 2017-06-27 20:46:13 +00:00
m4sk1n f01327d859 i18n: Turn report screen into a modal (pl) (#3974) 2017-06-27 22:14:31 +02:00
Sorin Davidoi eea5c01a41 fix(components/status): Up & down jump due to content being added to the DOM (#3972) 2017-06-27 18:43:53 +02:00
Eugen Rochko 0d316bcfd2 Turn report screen into a modal (#3965) 2017-06-27 18:07:21 +02:00
kibigo! 317de1efa8 Profile metadata improvements 2017-06-27 05:48:26 -07:00
Sorin Davidoi d6006ecb4b Responsive images in media gallery (#3963) 
* feat(components/media_gallery): Responsive images

* fix(components/media_gallery): Link to image URL
 2017-06-27 13:46:37 +02:00
Yamagishi Kazutoshi 8a9408b7c3 Maintain aspect ratio for preview image (#3966) 2017-06-27 13:43:53 +02:00
kibigo! 1ccb8a2d09 Disable account linking on collapsed toots too 2017-06-26 15:41:09 -07:00
kibigo! ebd299413c Disable links on collapsed toots 2017-06-26 15:22:03 -07:00
kibigo! 04bbba479a Notifications collapsed by default 2017-06-26 14:28:43 -07:00
Surinna Curtis 8f15cca3e2 Bio length on client side mostly doesn't count metadata 2017-06-26 09:34:31 -05:00
Alda Marteau-Hardi 103f87f9ae Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952) 2017-06-26 13:04:36 +02:00
kibigo! 88e1254643 Time needs to be just a little wider to accomodate minutes 2017-06-25 19:38:58 -07:00
kibigo! 6f6795841a We want wrapping here, sorry 😥 2017-06-25 19:26:59 -07:00
kibigo! bae5b5c074 Merge branch 'master' of https://github.com/glitch-soc/mastodon 2017-06-25 19:19:52 -07:00
kibigo! 734d681fe8 Expand toot by clicking on body [fixed!] 2017-06-25 19:19:45 -07:00
beatrix-bitrot ecfb516588 update bio length to 500 2017-06-26 02:18:52 +00:00
kibigo! d9cb3941d8 Stick images inside of CWs 2017-06-25 19:15:03 -07:00
kibigo! cfb2072045 Fixes to overflows wrt drawer/column 2017-06-25 18:05:28 -07:00
kibigo! 69e8ff3661 Fixed bad drawer custom.css 2017-06-25 17:55:48 -07:00
kibigo! ecbc3a3b8f Improvements to action bar positioning 2017-06-25 17:35:27 -07:00
Surinna Curtis 82f11f07f1 Move status action bar left 
This also resolves the issues where sometimes the timestamps wrap and also sits unpleasantly close to the … button.
 2017-06-25 18:24:50 -05:00
kibigo! 92c404d703 Clicking on a collapsed toot just uncollapses it. 2017-06-25 16:09:32 -07:00
kibigo! ab0e92d337 Auto-uncollapse when expanding CW 2017-06-25 15:52:55 -07:00
kibigo! f5cc235d7a [custom.scss] More media height fixes 2017-06-25 15:29:23 -07:00
kibigo! be33f28968 Disables CW [Show More/Less] links in collapsed toots 2017-06-25 15:25:19 -07:00
Eugen Rochko b90a44b6d0 Fix #3910 - Require OTP authentication to disable 2FA (#3935) 
* Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability
to generate new OTP backup codes *after* initial backup codes were handed
out during activation

* Restore recovery code re-generation

* Improve display of some 2FA elements
 2017-06-25 23:51:46 +02:00
kibigo! dfb494e69e [custom.scss] max-height of media now a fixed value 2017-06-25 14:44:52 -07:00
kibigo! fe70393072 Color adjustment to media icons 2017-06-25 14:25:35 -07:00
kibigo! f5a90db7ef Adds media icons to toots 2017-06-25 14:22:11 -07:00
kibigo! d5cf3e5570 Media previews for collapsed toots 2017-06-25 13:57:52 -07:00
kibigo! a988d0065a Patching rebase errors 2017-06-25 12:51:31 -07:00
Sorin Davidoi 2b1ab274fe fix(features/compose): Handle external changes to the textarea (#3632) 2017-06-25 21:43:27 +02:00
Shel Raphen 97f99bca98 Glitchsocification 2017-06-25 19:21:51 +00:00
Eugen Rochko c465c5b3a8 Add overview of active sessions (#3929) 
* Add overview of active sessions

* Better display of browser/platform name

* Improve how browser information is stored and displayed for sessions overview

* Fix test
 2017-06-25 16:54:30 +02:00
PFM f4d0f6954e Fix "undefined" in className (#3939) 2017-06-25 16:02:56 +02:00
kibigo! a6c43ea9fc Removed no-longer-necessary custom style 2017-06-24 21:28:30 -07:00
kibigo! fb3040dfc4 Better style handling at small sizes 2017-06-24 20:36:19 -07:00
kibigo! 1e6267ae2f Allowed little media rules 2017-06-24 20:14:58 -07:00
kibigo! cf1a103ee7 OKAY THIS WORKS THIS WORKS 2017-06-24 20:04:46 -07:00
kibigo! 10ca00107d Better settings handling with localSettings (new!) 2017-06-24 19:56:37 -07:00
kibigo! 2dc82d48ae Don't change layout of static pages 2017-06-24 18:30:59 -07:00
kibigo! b4b03c99f1 Use Redux store to keep track of layout 2017-06-24 18:30:30 -07:00
unarist 9a65f85934 Fix elephant in onboarding modal being very small sized on small devices (#3932) 2017-06-24 23:18:32 +02:00
unarist fdd982a562 Clean column collapsible (#3931) 
* Remove unused column_collapsable.js
* Remove old styles
* Extract `> div`  style to independent class
 2017-06-24 23:18:11 +02:00
Sorin Davidoi 8180d8bc35 feat(components/onboarding_modal): Swipe between pages (#3934) 2017-06-24 23:17:39 +02:00
Surinna Curtis b01b111ca1 Pass in correct "singleColumn" prop value when auto-columns is not used. 2017-06-24 15:29:46 -05:00
Surinna Curtis e5b6c21f32 Support overriding media queries for deciding between single-column/multi-column layouts with a class 2017-06-24 15:29:46 -05:00
Yamagishi Kazutoshi 6779ba5f18 Fix #3924 (regression from #3906) (#3925) 2017-06-24 12:24:02 +02:00
beatrix-bitrot 5be13a0557 clean up old avatar class 2017-06-24 03:51:01 +00:00
Matthew Walsh 2fb8475418 Unified avatar styling 
Avatars now have consistent styling across all pages; border radius can be adjusted with a SASS variable ($ui-avatar-border-size)
 2017-06-24 03:03:27 +00:00
kibigo! f277bf6012 Un-hide dropdown menu ;P 2017-06-23 19:39:44 -07:00
kibigo! cd07fb5b27 ESLint improvements for Profile Metadata 2017-06-23 18:43:30 -07:00
Gô Shoemake 26254fc5c4 Reblog support for collapsed toots 2017-06-23 18:23:26 -07:00
unarist 45058b5fde Use debounce for dispatch scrollTopNotification and expandNotifications (#3700) 2017-06-24 02:43:26 +02:00
beatrix-bitrot 5c3d671a72 missing punctuation 2017-06-23 22:01:04 +00:00
beatrix 05b01bbb4c glitch the getting started image 2017-06-23 21:50:45 +00:00
kibigo! be420f4139 Very minor styling improvements to toot-collapsing 2017-06-23 21:50:45 +00:00
kibigo! 32574a7e3c Updates height upon collapsing 2017-06-23 21:50:45 +00:00
kibigo! 58cdc55bd5 Minor collapsing button improvements~ 2017-06-23 21:50:45 +00:00
kibigo! 744917179b Collapsable toots [1/??] ☕️ 2017-06-23 21:50:45 +00:00
kibigo! a36c6a3e54 ✨ Profile Metadata HACK 😈 2017-06-23 21:45:14 +00:00
Go Shoemake b7a2221b17 Fixes drawer so stuff doesn't overflow 2017-06-23 21:45:14 +00:00
Charlotte Fields a7a7613e71 cybre cleanup 2017-06-23 21:45:14 +00:00
Chronister bf32615615 cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
Chronister 2edadd7fe7 All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
Charlotte Fields 23451f1066 adding cybre changes 2017-06-23 21:45:14 +00:00
Daniel Hunsaker 0c8f23b69f Fix a typo and give CW'd statuses the right cursor (#3918) 2017-06-23 23:13:27 +02:00
Yamagishi Kazutoshi e2027fbe42 Use Class and Property Decorators (#3730) 
ref https://tc39.github.io/proposal-decorators/
 2017-06-23 19:36:54 +02:00
Eugen Rochko 88458a1638 Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures 2017-06-23 17:52:39 +02:00
Yamagishi Kazutoshi 539dbaa049 Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
Yamagishi Kazutoshi bc21ffd237 Add prefix to setting toggle ID (#3907) 2017-06-23 13:55:05 +02:00
Sorin Davidoi 9366672d53 fix: Apply :hover, :focus and :active only when multiple columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi 501a3cf944 feat: Swipeable media 2017-06-23 13:48:46 +02:00
Sorin Davidoi 598bb06687 feat: Swipeable columns 2017-06-23 13:48:46 +02:00
unarist 66e14b3d3a Don't attach IntersectionObserver for wrapped statuses (#3883) 
(This patch has been merged as bugfix and reverted, but still valuable as
improvement)

Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. but wrapped Status don't need to manage
intersection and visibility by itself, because it's a part of wrapper Status.
 2017-06-21 06:47:36 +02:00
Eugen Rochko 65b46159ec Revert #3851 (#3878) 2017-06-21 01:37:15 +02:00
Eugen Rochko cbc0fea992 Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877) 
* Revert "Bump version to 1.4.4"

This reverts commit bd6bee29de.

* Revert "Fix conversations (fixes #3869) (#3870)"

This reverts commit ee7952c349.

* Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)"

This reverts commit 8f202bc639.

* Revert "Filter direct statuses in Status.as_home_timeline (#3842)"

This reverts commit 77dcf442e7.

* Revert "Fix RemoteFollow behavior (#3868)"

This reverts commit 1d2eba7a84.

* Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)"

This reverts commit baa248a801.

* Revert "Upgrade React Router (#3677)"

This reverts commit 9bc32eb267.

* Revert "Do not call setState from unmounted component (#3853)"

This reverts commit 59849b392d.

* Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)"

This reverts commit 47dceaded6.

* Revert "Fix RTL detection on Ruby side (#3867)"

This reverts commit 55376105f5.

* Revert "i18n: Fixed typo in Polish translation (#3864)"

This reverts commit 3c355ed26b.

* Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)"

This reverts commit 79c04b0a2c.
 2017-06-21 01:33:14 +02:00
Sorin Davidoi 9bc32eb267 Upgrade React Router (#3677) 
* chore(yarn): Remove react-router

* chore(yarn): Remove react-router-scroll

* chore(yarn): Remove history

* chore(yarn): Add react-router-dom

* chore: Remove usages of react-router-scroll

* refactor: Upgrade to react-router-web

* refactor: Use fork of react-router-scroll

This reverts commit 2ddea9a6c8d39fc64b7d0b587f3fbda7a45a7fa2.

* fix: Issues mentions in the PR feedback
 2017-06-20 20:40:03 +02:00
alpaca-tc 59849b392d Do not call setState from unmounted component (#3853) 
Stop an executing task if the component already unmounted.
 2017-06-20 20:37:09 +02:00
Yamagishi Kazutoshi 47dceaded6 Replace TextIconButton for SensitiveButton to IconButton (#3759) 
* Replace TextIconButton for SensitiveButton to IconButton

* line-height
 2017-06-20 19:43:09 +02:00
unarist 79c04b0a2c Don't attach IntersectionObserver for wrapped statuses (#3863) 
This fixes a bug that sometimes boosted statuses being hidden on scrolling.

Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. This will call intersection handler twice,
so this may results race condition...probably.
 2017-06-20 04:12:51 +02:00
unarist 9e5c733a66 Clicking on the CW text should expand the status (#3855) 2017-06-20 01:34:10 +02:00
unarist 8db07d1187 Set cursor:pointer only when necessary (#3857) 2017-06-19 18:27:07 +02:00
Gô Shoemake 2d31077bdf Fix character/grapheme count stuff (#3839) 
* Bring Toot button in line with counter

Both should use stringz I guess

* Use grapheme_length for character count
 2017-06-19 11:31:14 +02:00
alpaca-tc 36049c0096 Unobserve status on unmount (#3851) 2017-06-19 11:29:57 +02:00
alpaca-tc fa14f245f8 Fixes streaming callbacks of HashtagTimeline (#3849) 2017-06-19 10:28:35 +02:00
Eugen Rochko 4845069692 Debounce autosuggestions (#3836) 
* Debounce autosuggestions

* Remove duplicate import
 2017-06-19 01:50:56 +02:00
Nolan Lawson 424cf0a590 Fix jittery scrolling for Chromium browsers (#3776) (#3832) 2017-06-18 02:59:29 +02:00
Nolan Lawson f973d620ca handle resize in a debounce() (#3834) 2017-06-18 02:57:41 +02:00
Yamagishi Kazutoshi dd7fb41dbb Add alt attribute to ImageLoader (#3765) 2017-06-15 14:10:41 +02:00
Eugen Rochko 86211d3ca6 Fix regression from #3748 - properly set defaultColumns (#3750) 2017-06-14 23:07:06 +02:00
unarist 167ba4c5f7 Fix merge default columns (#3748) 
mergeDeep also merges columns, but it should be replaced simply.

So in the new function, first apply mergeDeep except columns, and set default columns if columns unset.
 2017-06-14 21:59:52 +02:00
Eugen Rochko afefb364cb Save settings when they are changed (#3743) 2017-06-14 18:59:02 +02:00
Eugen Rochko 1c7e2ddd65 Account deletion (#3728) 
* Add form for account deletion

* If avatar or header are gone from source, remove them

* Add option to have SuspendAccountService remove user record, add tests

* Exclude suspended accounts from search
 2017-06-14 18:01:27 +02:00
Sorin Davidoi cf69bdc097 fix(status): Content jump due to height changes (#3734) 2017-06-13 20:46:21 +02:00
Eugen Rochko 9ba171309b Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725) 2017-06-13 03:55:28 +02:00
Eugen Rochko 91e13e3cf8 Fix unclickable onboardin modal regression (#3724) 2017-06-13 00:39:31 +02:00
m4sk1n 5b0518ada5 i18n: minor fix in Polish translation (#3726) 
* i18n: minor fix in Polish translation

* i18n
 2017-06-12 23:55:32 +02:00