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

6553 Commits (08a981dd254333c4eda0addfea15082f7e7e78e8)

Author SHA1 Message Date
Thibaut Girka 850f8195fd Minor style fixes 2019-05-04 23:05:43 +02:00
Eugen Rochko 5df7b98c2b [Glitch] Change font weight of sensitive button to 500 
Port f7879bbe08 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Eugen Rochko 8050f86d04 [Glitch] Make the "mark media as sensitive" button more obvious in web UI 
Port cc39785d45 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Thibaut Girka 167808363d Add visibility icon back in media gallery 2019-05-04 20:06:17 +02:00
Thibaut Girka 43dc5ad0e5 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG d0342a1a63 [Glitch] Fix transition: all 
Port 9e044c9649 to glitch-soc
 2019-05-04 19:53:09 +02:00
ThibG 09d6a2920d [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Thibaut Girka 5d6f4ef070 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
Eugen Rochko 52c09770fe [Glitch] Add button to view context to media modal 
Port 4aabc452d0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 19:10:24 +02:00
Eugen Rochko 6138cad296 [Glitch] Fix alignment of items in the account gallery in web UI and load more per page 
Port 78f5b96bf6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:59:11 +02:00
Eugen Rochko 3b9ff1fa34 [Glitch] Change account gallery in web UI 
Port db73f8e585 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:54:57 +02:00
Thibaut Girka 61b5fd518c Minor CSS fixes 2019-05-04 18:18:15 +02:00
Eugen Rochko 87a7a9a4df [Glitch] Add blurhash 
Port front-end changes from a6d2fe7165 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:07:44 +02:00
ThibG 9e044c9649 Fix transition: all (#10699) 2019-05-04 17:39:53 +02:00
ThibG d5357fcbf2 Minor account media gallery fixes (#10695) 
* Make the cursor icon consistant across media types in account media gallery

* Fix the video player modal causing scroll position to reset
 2019-05-04 17:36:43 +02:00
ThibG 0f1d2f4d71 Fix glitch SCSS for links in error messages in admin interface 
Port SCSS changes from 8c716f917f
 2019-05-04 16:43:08 +02:00
Thibaut Girka 73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
ThibG 09ce4ea53c Do not retry processing ActivityPub jobs raising validation errors (#10614) 
* Do not retry processing ActivityPub jobs raising validation errors

Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.

* Lower RecordInvalid error reporting to debug log level

* Remove trailing whitespace
 2019-05-03 23:45:37 +02:00
Eugen Rochko c3b1f6963b Change e-mail whitelist/blacklist to not be checked when invited (#10683) 
* Change e-mail whitelist/blacklist to not be checked when invited

And only when creating an account, not when updating it later

Fix #10648

* Fix test
 2019-05-03 23:44:44 +02:00
Thibaut Girka d20647fd94 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko f7879bbe08 Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG 4c4f9d78fd Explicitly disable storage of REST API results (#10655) 
Fixes #10652
 2019-05-03 20:39:19 +02:00
ThibG 8c716f917f Provide a link to existing domain block when trying to block an already-blocked domain (#10663) 
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
 2019-05-03 20:36:36 +02:00
Thibaut Girka c15b1aa00c Fix crash in onboarding modal 
Fixes #1027
 2019-05-03 19:24:54 +02:00
Eugen Rochko 4aabc452d0 Add button to view context to media modal (#10676) 
* Add "view context" button to media modal when opened from gallery

* Add "view context" button to video modal

Allow closing the video modal by navigating back in the browser,
just like the media modal
 2019-05-03 16:16:30 +02:00
ThibG d8418c07c9 When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko cc39785d45 Make the "mark media as sensitive" button more obvious in web UI (#10673) 
* Make the "mark media as sensitive" button more obvious in web UI

* Use eye-slash icon instead of eye icon to mean "hide"
 2019-05-03 04:34:55 +02:00
Eugen Rochko 78f5b96bf6 Fix alignment of items in the account gallery in web UI and load more per page (#10674) 2019-05-03 04:02:55 +02:00
Eugen Rochko db73f8e585 Change account gallery in web UI (#10667) 
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
 2019-05-02 08:34:32 +02:00
ThibG af3971a0e6 Check that an invite link is valid before bypassing approval mode (#10657) 
* Check that an invite link is valid before bypassing approval mode

Fixes #10656

* Add tests

* Only consider valid invite links in registration controller

* fixup
 2019-05-02 04:30:12 +02:00
Thibaut Girka c4865cbd25 Add site-wide options to show reblogs and replies in local/public timelines 
Fixes #1021
 2019-05-01 22:33:09 +02:00
Thibaut Girka e53b2a9c37 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka f5f0bd6c0a Add high color privacy icons 
Fixes #1015
 2019-05-01 16:38:01 +02:00
Zac 826d926bb9 changed pinned status count operator 
changed default pinned count to 5 to preserve default behavior
 2019-04-29 20:52:53 +02:00
Zac 5a3d18a660 added documentation into .env.production.sample 
moved max pin count into constant
 2019-04-29 20:52:53 +02:00
Zac 41d3d17fe7 add env var for max pinned toots 2019-04-29 20:52:53 +02:00
Thibaut Girka 98732502f5 When selecting a toot via keyboard, ensure it is scrolled into view 
Fixes detailed status column
 2019-04-29 20:28:38 +02:00
Thibaut Girka 81c9377c7d Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka 02bd678944 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka 7ed89e9178 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
partev f843bdbd73 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Eugen Rochko b1e10ed1b3 Fix approved column being set to nil instead of false (#10642) 
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
 2019-04-27 23:55:16 +02:00
Thibaut Girka 5a8b820767 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Eugen Rochko a6d2fe7165 Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
Thibaut Girka b40841b488 Hide suggestions by default 
They will be enabled if the input has focus
 2019-04-26 22:38:03 +02:00
Thibaut Girka e720f1eac2 Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka 4155a1556a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka b35b38f4ea Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka 0541e4ad21 Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
Eugen Rochko be7bab1fd9 Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
Eugen Rochko 2ba12c8917 Fix not being able to save e-mail preference for new pending accounts (#10622) 2019-04-25 02:49:06 +02:00
ThibG 23e87a4742 Fix upload progressbar when image resizing is involved (#10632) 2019-04-25 02:48:54 +02:00
ThibG 140be28787 Reject follow requests of blocked users (#10633) 2019-04-25 02:47:33 +02:00
Thibaut Girka 642a298ceb Do not ask to register web intent handler 2019-04-24 23:05:11 +02:00
Thibaut Girka 8942036345 Fix color of muted statuses content not wrapped in a p tag 2019-04-24 22:40:17 +02:00
Thibaut Girka 73f83ef399 Redesign blockquote styling 2019-04-24 22:40:17 +02:00
Thibaut Girka f5ea016889 Better distinguish titles from text 2019-04-24 22:40:17 +02:00
Thibaut Girka 8003dd8849 Remove extra margin in paragraphs inside blockquotes 2019-04-24 22:40:17 +02:00
Thibaut Girka a855f38086 Make bold text bolder 2019-04-24 22:40:17 +02:00
Thibaut Girka ad30895262 Remove margins around `p` tags in lists 2019-04-24 22:40:17 +02:00
Thibaut Girka ce2da44c2c Rename status__text to status__content__text for consistency with upstream 2019-04-24 22:40:17 +02:00
Thibaut Girka facc95f71a Fix status header display in toot mobile menu 2019-04-24 20:21:19 +02:00
Thibaut Girka b43cfd3eb3 Fix upload progressbar when image resizing is involved 2019-04-24 20:19:23 +02:00
Thibaut Girka 4a95bfe919 Hide media upload form if no media are attached 2019-04-24 19:47:11 +02:00
Thibaut Girka 0f97c82eac Merge branch 'master' into glitch-soc/merge-upstream 2019-04-24 15:25:22 +02:00
Thibaut Girka 07367bc6ec Fix file upload 2019-04-24 07:57:28 +02:00
Thibaut Girka 86108e7af7 Fix settings modal 2019-04-23 18:31:13 +02:00
Eugen Rochko 72f3242a59 Fix sign up button not saying sign up when invite is used (#10623) 
Fix #10616
 2019-04-23 04:39:21 +02:00
Thibaut Girka 2d2eca5bda Do not leak local-only toots to remote mentioned users 2019-04-22 23:37:50 +02:00
Thibaut Girka 2ad61962ae Load custom CSS rules after standard ones 
Fixes #933

Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.

They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
 2019-04-22 23:07:27 +02:00
Thibaut Girka 9aeb714b7a Add support for lists in statuses 2019-04-22 23:07:14 +02:00
Thibaut Girka fea727c61a Do not switch to italic for status media buttons 2019-04-22 23:07:14 +02:00
Thibaut Girka 22ad8c89b2 Accept richer text from remote statuses 
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
 2019-04-22 23:07:14 +02:00
kedama 4ce6358787 [Glitch] Fix modal items cannot scroll on touch devices 
Port 92ced1e94b to glitch-soc
 2019-04-22 22:57:39 +02:00
Thibaut Girka 6f85bb754b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 2019-04-22 20:40:04 +02:00
Thibaut Girka 1b8d2af1f9 Fix ReferenceError in dropdown 2019-04-22 20:15:47 +02:00
Thibaut Girka 25cfabce26 Fix broken reference to handleSubmit 2019-04-22 20:15:47 +02:00
Thibaut Girka 041e27bd2d Cleanup 2019-04-22 20:15:47 +02:00
Thibaut Girka 2ee26ba420 Move ComposerPublisher to Compose 2019-04-22 20:15:47 +02:00
Thibaut Girka bf8b0394b7 Add OptionsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka ef17da32f9 Move composer Dropdown from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka a6bb49adf1 Move ComposerTextareaIcons to TextareaIcons 2019-04-22 20:15:47 +02:00
Thibaut Girka 08faf16d66 ComposerTextarea → AutosuggestTextarea 2019-04-22 20:15:47 +02:00
Thibaut Girka 513547ba57 ComposerUploadForm → UploadForm + UploadFormContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka f7d1772fc8 Move PollForm from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka 2021f14e8f Inline spoiler input 2019-04-22 20:15:47 +02:00
Thibaut Girka 3529f6f4ae ComposerReply → ReplyIndicator 2019-04-22 20:15:47 +02:00
Thibaut Girka ad6166f0ef Refactor Compose*Warning → ContainerWarning 
Regression: only one warning at a time
 2019-04-22 20:15:47 +02:00
Thibaut Girka 5e4588524b features/composer/index.js → ComposeForm 2019-04-22 20:15:47 +02:00
Thibaut Girka 8ea0e64864 DrawerHeader → Header + HeaderContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 2f2381a400 DrawerAccount → NavigationBar + NavigationContainer 2019-04-22 20:15:47 +02:00
Eugen Rochko 7acc035cbe [Glitch] Show suggested follows on search screen in mobile layout 
Port 541fda5fc8 to glitch-soc
 2019-04-22 20:15:47 +02:00
Thibaut Girka 4aee182cd3 DrawerResults → SearchResults + SearchResultsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 7c2cc9d681 Rework DrawerResults to make them closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka 5264424b71 Move DrawerSearch to Search + SearchContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 7fa3320516 Inline DrawerSearchPopout in DrawerSearch 2019-04-22 20:15:47 +02:00
Thibaut Girka a55e1c1d49 Refactor a bit DrawerSearch to make it closer to upstream 2019-04-22 20:15:47 +02:00
Thibaut Girka e41c4ad61b Rename flavours/glitch/features/drawer to flavours/glitch/features/compose 2019-04-22 20:15:47 +02:00
ThibG eb80c3924f Allow switching between singe-option and multiple-option polls (#10603) 2019-04-22 14:56:14 +02:00
kedama 92ced1e94b Fix modal items cannot scroll on touch devices (#10605) 2019-04-22 14:55:50 +02:00