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

9257 Commits (3b9ff1fa34a739ac965f6e2785e8205148459b40)

Author SHA1 Message Date
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
Marek Ľach 63e9783e7d New string added for Slovak translation (#10637) 2019-04-26 18:07:36 +02:00
dependabot[bot] b3d218e5a1 Bump bootsnap from 1.4.3 to 1.4.4 (#10634) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-25 13:36:56 +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
ThibG 0ffd5fdd2c Merge pull request #1007 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-24 19:42:33 +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
dependabot[bot] d5d779cd34 Bump sidekiq from 5.2.6 to 5.2.7 (#10627) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 16:39:06 +02:00
dependabot[bot] 795f2a7c8f Bump capybara from 3.17.0 to 3.18.0 (#10626) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 18:53:52 +09:00
Eugen Rochko 55449c0b41 Fix stoplight logging to stderr separate from Rails logger (#10624) 2019-04-23 04:39:48 +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
dependabot[bot] 7ea37bbdc8 [Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 10:02:58 +09:00
dependabot[bot] 907415ac08 Bump capybara from 3.16.2 to 3.17.0 (#10602) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 00:54:51 +02:00
Fabian Schlenz 2d6fd9197b Fixed Healthchecks in docker-compose.yml (#10553) 2019-04-23 00:54:26 +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
ThibG b2f73231a4 Merge pull request #1002 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-22 23:06:54 +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