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

8516 Commits (dcf363a6238a63bb6f42548e675a8cb4ca154772)

Author SHA1 Message Date
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 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 () 
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 () 2019-02-01 09:18:40 +09:00
Eugen Rochko 9cef8f1eb7 Fix link color in high-contrast theme, add underlines () 
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 () 
* 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 () 2019-02-01 08:13:47 +09:00
Marek Ľach 435f44a8cc Distinguish error messaging for mystyped URLs and deleted accounts () 2019-02-01 00:07:08 +01:00
Clar Charr 4fb1d8129d Replace unlock-alt icon with unlock () 2019-01-31 13:45:15 +01:00
dependabot[bot] 293907f653 Bump rails-i18n from 5.1.2 to 5.1.3 () 
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 🇵🇱 () 
* 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 () 
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 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 () 2019-01-28 04:24:12 +01:00
Eugen Rochko 49aaaa77a6 Fix slow fallback of CopyAccountStats migration setting stats to 0 () 2019-01-28 04:18:35 +01:00
Eugen Rochko 3b5b6d19f5 Add note that contributors may request reimbursement through OpenCollective () 2019-01-28 04:17:11 +01:00
Stanislas 92801eba9e Fix SUPERUSER postgres command () 2019-01-27 23:56:07 +01:00
ThibG be886031f3 Merge pull request 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 () 
* 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 () 2019-01-27 17:54:54 +01:00
ThibG d6293b156a Merge pull request 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 () 2019-01-26 23:59:39 +01:00
ThibG c7f31d81fa Merge pull request 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 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 () 
Fix
2019-01-25 12:36:54 +01:00
trwnh 36b6fee96d Fix Firefox scrollbar color regression in () 
In  the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in  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 .
 2019-01-25 11:48:27 +01:00
Jeong Arm fdf6c4a63f Apply style for .landing-page strong () 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 () 
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 () 
In  the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in  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 .
 2019-01-24 13:32:23 +01:00
ThibG 3ce20bc837 Merge pull request 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
2019-01-23 18:29:18 +01:00
dependabot[bot] 3dd3b199e8 Bump oj from 3.7.7 to 3.7.8 () 
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
dependabot[bot] 3ee6c5cdba Bump rubocop from 0.63.0 to 0.63.1 () 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.0 to 0.63.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.63.0...v0.63.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-22 20:32:49 +09:00
Jeong Arm f909d00241 Apply style for .landing-page strong () 2019-01-21 20:03:44 +01:00
ThibG a238beb870 Fix scheduled toot with media immediately creating a toot () 
* Add test for not persisting status when attaching media to scheduled toot

* Prevent status used for validation from being persisted to the database

Fixes 

Thanks to tateisu for the help investigating this.
 2019-01-21 20:03:04 +01:00
dependabot[bot] 5fcef3efa5 Bump json-ld-preloaded from 3.0.0 to 3.0.2 () 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.0...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-21 21:39:52 +09:00
dependabot[bot] b41575c96f Bump pundit from 2.0.0 to 2.0.1 () 
Bumps [pundit](https://github.com/varvet/pundit) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/commits)

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