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

8521 Commits (b05cda87f8b2c79f009664929f0da81bf7d3aad1)

Author SHA1 Message Date
Thibaut Girka b05cda87f8 Refactor intersection observer article code 2019-02-10 22:54:25 +01:00
Thibaut Girka 18a540da9f Cleanup redundant markup for hidden statuses 2019-02-10 22:54:25 +01:00
Thibaut Girka f2b7ab4523 Hide items rendered out-of-frame (once they have been rendered at least once) 2019-02-10 22:54:25 +01:00
Thibaut Girka a9078c18eb Fix CW unfolding not triggering re-layout in public hashtag page 2019-02-06 15:32:48 +01:00
Thibaut Girka d55233da9a Fix unfolding CWs on public hashtag page 
Fixes #909
 2019-02-06 14:37:57 +01:00
Thibaut Girka dcf363a623 Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach 43b2f021eb Minor description corrections 2019-02-03 00:30:34 +01:00
ThibG e04845c06c Merge pull request #904 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-01 18:24:36 +01:00
Eugen Rochko 252a765368 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka fba0f7dae7 [Glitch] Replace unlock-alt icon with unlock 
Port 4fb1d8129d to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka aaf98669a5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
 2019-02-01 16:12:20 +01:00
Thibaut Girka b0e7af725a Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka afdf789d06 Fix hashtag processing when sending toots 
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
 2019-02-01 12:37:28 +01:00
Marek Ľach 42bd0e3a51 More corrections for the Slovak translation (#9959) 2019-02-01 09:18:40 +09:00
Eugen Rochko 9cef8f1eb7 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 00:15:38 +01:00
Eugen Rochko 77dc5cc132 Refactor icons in web UI to use Icon component (#9951) 
* Refactor uses of icons to an Icon component in web UI

* Refactor options passed to the Icon component

* Make tests work with absolute component paths
 2019-02-01 00:14:05 +01:00
Marek Ľach 294a1a17d7 Update the Slovak translation (#9958) 2019-02-01 08:13:47 +09:00
Marek Ľach 435f44a8cc Distinguish error messaging for mystyped URLs and deleted accounts (#9957) 2019-02-01 00:07:08 +01:00
Clar Charr 4fb1d8129d Replace unlock-alt icon with unlock (#9952) 2019-01-31 13:45:15 +01:00
dependabot[bot] 293907f653 Bump rails-i18n from 5.1.2 to 5.1.3 (#9943) 
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-30 04:22:59 +09:00
marcin mikołajczak c062f6033c i18n: Update Polish translation 🇵🇱 (#9945) 
* Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* normalize

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* inconsistentInterpolations--

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2019-01-30 04:21:15 +09:00
Sam Schlinkert 178176966e Bumps copyright year in README.md to 2019 (#9939) 
This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.
 2019-01-28 22:57:42 +01:00
ThibG d524244d3a Merge pull request #901 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-28 21:40:38 +01:00
Thibaut Girka 3be4189998 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md: kept our version
 2019-01-28 21:14:47 +01:00
Eugen Rochko 0848f9b66c Bump version to 2.7.1 (#9932) 2019-01-28 04:24:12 +01:00
Eugen Rochko 49aaaa77a6 Fix slow fallback of CopyAccountStats migration setting stats to 0 (#9930) 2019-01-28 04:18:35 +01:00
Eugen Rochko 3b5b6d19f5 Add note that contributors may request reimbursement through OpenCollective (#9933) 2019-01-28 04:17:11 +01:00
Stanislas 92801eba9e Fix SUPERUSER postgres command (#9877) 2019-01-27 23:56:07 +01:00
ThibG be886031f3 Merge pull request #900 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-27 22:24:29 +01:00
Thibaut Girka 00fc362103 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port b5feaa4d54 to glitch-soc
 2019-01-27 22:02:59 +01:00
Thibaut Girka 333d3a2990 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG b5feaa4d54 Fix initial value of volume slider in video player and handle volume changes (#9929) 
* Fix initial value of volume slider in video player and handle volume changes

* Clean up dead/incorrect code
 2019-01-27 21:18:15 +01:00
ThibG 09f7773e26 Implement missing hotkeys for notifications (#9927) 2019-01-27 17:54:54 +01:00
ThibG d6293b156a Merge pull request #899 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-27 14:23:24 +01:00
Thibaut Girka 0ccf92ad09 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
Thibaut Girka 9bd95f11e5 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka bb035bb0ab Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG b1c76ef610 Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
ThibG c7f31d81fa Merge pull request #897 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-26 18:47:48 +01:00
Thibaut Girka edb28be20b Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
ThibG 314adc2447 Merge pull request #896 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-25 22:42:21 +01:00
Eugen Rochko e259f244c6 Fix SSO authentication not working due to missing agreement boolean (#9915) 
Fix #9906
 2019-01-25 12:36:54 +01:00
trwnh 36b6fee96d Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
 2019-01-25 11:48:27 +01:00
Jeong Arm fdf6c4a63f Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka a9c3e77e81 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira cde2fe25b9 Rescue SSL error in verify link service (#9914) 
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
 2019-01-24 15:38:18 +01:00
trwnh 26fc37a2ea Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
 2019-01-24 13:32:23 +01:00
ThibG 3ce20bc837 Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash 
Fix crash in Direct Messages column settings
 2019-01-23 18:53:36 +01:00
Thibaut Girka 5e7c9c04e2 Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
dependabot[bot] 3dd3b199e8 Bump oj from 3.7.7 to 3.7.8 (#9900) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.7 to 3.7.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.7...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-22 20:33:20 +09:00