fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
9212 commits 135 branches 266 tags 983 MiB
Commit graph

6463 commits

Author SHA1 Message Date
Zac be6ef1947e changed pinned status count operator 
changed default pinned count to 5 to preserve default behavior
 2019-04-29 20:52:53 +02:00
Zac 5616200ed4 added documentation into .env.production.sample 
moved max pin count into constant
 2019-04-29 20:52:53 +02:00
Zac a36affb9d6 add env var for max pinned toots 2019-04-29 20:52:53 +02:00
Thibaut Girka d4c95e6a8a 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 3e095cab83 Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka 67fb9a8679 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka f3acf8f414 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
Thibaut Girka cd9a284702 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Thibaut Girka aa1832ac4d Hide suggestions by default 
They will be enabled if the input has focus
 2019-04-26 22:38:03 +02:00
Thibaut Girka fddd8251dd Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka d7e4be285a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka df52004fe6 Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka 3a671470ec Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
Thibaut Girka 1c0402c103 Do not ask to register web intent handler 2019-04-24 23:05:11 +02:00
Thibaut Girka b13c90f3e3 Fix color of muted statuses content not wrapped in a p tag 2019-04-24 22:40:17 +02:00
Thibaut Girka e4b65e6349 Redesign blockquote styling 2019-04-24 22:40:17 +02:00
Thibaut Girka 8753e5317f Better distinguish titles from text 2019-04-24 22:40:17 +02:00
Thibaut Girka 3631c3314a Remove extra margin in paragraphs inside blockquotes 2019-04-24 22:40:17 +02:00
Thibaut Girka 9b86707b1e Make bold text bolder 2019-04-24 22:40:17 +02:00
Thibaut Girka 5a8495dabe Remove margins around p tags in lists 2019-04-24 22:40:17 +02:00
Thibaut Girka ef249a2718 Rename status__text to status__content__text for consistency with upstream 2019-04-24 22:40:17 +02:00
Thibaut Girka adbb174c9c Fix status header display in toot mobile menu 2019-04-24 20:21:19 +02:00
Thibaut Girka ef1504d625 Fix upload progressbar when image resizing is involved 2019-04-24 20:19:23 +02:00
Thibaut Girka ffab9d626a Hide media upload form if no media are attached 2019-04-24 19:47:11 +02:00
Thibaut Girka 7783ec921b Merge branch 'master' into glitch-soc/merge-upstream 2019-04-24 15:25:22 +02:00
Thibaut Girka 416aa832e5 Fix file upload 2019-04-24 07:57:28 +02:00
Thibaut Girka 3d722b0c4e Fix settings modal 2019-04-23 18:31:13 +02:00
Eugen Rochko 041fb0e840
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 08afd6b69c Do not leak local-only toots to remote mentioned users 2019-04-22 23:37:50 +02:00
Thibaut Girka 2db0506226 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 27e8354914 Add support for lists in statuses 2019-04-22 23:07:14 +02:00
Thibaut Girka 659f972bed Do not switch to italic for status media buttons 2019-04-22 23:07:14 +02:00
Thibaut Girka 2e3640ecbb 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 039e35560c [Glitch] Fix modal items cannot scroll on touch devices 
Port d763d39d26 to glitch-soc
 2019-04-22 22:57:39 +02:00
Thibaut Girka a9eaa780f5 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 c3fa4e8e07 Fix ReferenceError in dropdown 2019-04-22 20:15:47 +02:00
Thibaut Girka d779ec1f0e Fix broken reference to handleSubmit 2019-04-22 20:15:47 +02:00
Thibaut Girka e949861176 Cleanup 2019-04-22 20:15:47 +02:00
Thibaut Girka faff152ae5 Move ComposerPublisher to Compose 2019-04-22 20:15:47 +02:00
Thibaut Girka df951c319c Add OptionsContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka 14028655df Move composer Dropdown from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka 4c6221929f Move ComposerTextareaIcons to TextareaIcons 2019-04-22 20:15:47 +02:00
Thibaut Girka 47faf47ed5 ComposerTextarea → AutosuggestTextarea 2019-04-22 20:15:47 +02:00
Thibaut Girka a243567a3e ComposerUploadForm → UploadForm + UploadFormContainer 2019-04-22 20:15:47 +02:00
Thibaut Girka c5f49a92dc Move PollForm from features/composer to features/compose 2019-04-22 20:15:47 +02:00
Thibaut Girka f1a22e33e2 Inline spoiler input 2019-04-22 20:15:47 +02:00
Thibaut Girka 8fd599fb40 ComposerReply → ReplyIndicator 2019-04-22 20:15:47 +02:00
Thibaut Girka f72af5794d Refactor Compose*Warning → ContainerWarning 
Regression: only one warning at a time
 2019-04-22 20:15:47 +02:00
Thibaut Girka 1bc4b8a0a5 features/composer/index.js → ComposeForm 2019-04-22 20:15:47 +02:00
Thibaut Girka 281a82d878 DrawerHeader → Header + HeaderContainer 2019-04-22 20:15:47 +02:00