]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years ago[Glitch] Replace unlock-alt icon with unlock
Thibaut Girka [Fri, 1 Feb 2019 15:15:44 +0000 (16:15 +0100)]
[Glitch] Replace unlock-alt icon with unlock

Port 6513f6c953cdaad9118ea24a21f22fd2978bed28 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 1 Feb 2019 15:12:20 +0000 (16:12 +0100)]
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

7 years agoDo not mark toots as sensitive if they don't have any media attached
Thibaut Girka [Fri, 1 Feb 2019 11:45:53 +0000 (12:45 +0100)]
Do not mark toots as sensitive if they don't have any media attached

7 years agoFix hashtag processing when sending toots
Thibaut Girka [Fri, 1 Feb 2019 10:41:34 +0000 (11:41 +0100)]
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.

7 years agoMore corrections for the Slovak translation (#9959)
Marek Ľach [Fri, 1 Feb 2019 00:18:40 +0000 (01:18 +0100)]
More corrections for the Slovak translation (#9959)

7 years agoFix link color in high-contrast theme, add underlines (#9949)
Eugen Rochko [Thu, 31 Jan 2019 23:15:38 +0000 (00:15 +0100)]
Fix link color in high-contrast theme, add underlines (#9949)

Improve sorting of default themes in the dropdown

7 years agoRefactor icons in web UI to use Icon component (#9951)
Eugen Rochko [Thu, 31 Jan 2019 23:14:05 +0000 (00:14 +0100)]
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

7 years agoUpdate the Slovak translation (#9958)
Marek Ľach [Thu, 31 Jan 2019 23:13:47 +0000 (00:13 +0100)]
Update the Slovak translation (#9958)

7 years agoDistinguish error messaging for mystyped URLs and deleted accounts (#9957)
Marek Ľach [Thu, 31 Jan 2019 23:07:08 +0000 (00:07 +0100)]
Distinguish error messaging for mystyped URLs and deleted accounts (#9957)

7 years agoReplace unlock-alt icon with unlock (#9952)
Clar Charr [Thu, 31 Jan 2019 12:45:15 +0000 (07:45 -0500)]
Replace unlock-alt icon with unlock (#9952)

7 years agoBump rails-i18n from 5.1.2 to 5.1.3 (#9943)
dependabot[bot] [Tue, 29 Jan 2019 19:22:59 +0000 (04:22 +0900)]
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>
7 years agoi18n: Update Polish translation 🇵🇱 (#9945)
marcin mikołajczak [Tue, 29 Jan 2019 19:21:15 +0000 (20:21 +0100)]
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>
7 years agoBumps copyright year in README.md to 2019 (#9939)
Sam Schlinkert [Mon, 28 Jan 2019 21:57:42 +0000 (16:57 -0500)]
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.

7 years agoMerge pull request #901 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 28 Jan 2019 20:40:38 +0000 (21:40 +0100)]
Merge pull request #901 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 28 Jan 2019 20:14:47 +0000 (21:14 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md: kept our version

7 years agoBump version to 2.7.1 (#9932)
Eugen Rochko [Mon, 28 Jan 2019 03:24:12 +0000 (04:24 +0100)]
Bump version to 2.7.1 (#9932)

7 years agoFix slow fallback of CopyAccountStats migration setting stats to 0 (#9930)
Eugen Rochko [Mon, 28 Jan 2019 03:18:35 +0000 (04:18 +0100)]
Fix slow fallback of CopyAccountStats migration setting stats to 0 (#9930)

7 years agoAdd note that contributors may request reimbursement through OpenCollective (#9933)
Eugen Rochko [Mon, 28 Jan 2019 03:17:11 +0000 (04:17 +0100)]
Add note that contributors may request reimbursement through OpenCollective (#9933)

7 years agoFix SUPERUSER postgres command (#9877)
Stanislas [Sun, 27 Jan 2019 22:56:07 +0000 (23:56 +0100)]
Fix SUPERUSER postgres command (#9877)

7 years agoMerge pull request #900 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 27 Jan 2019 21:24:29 +0000 (22:24 +0100)]
Merge pull request #900 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years ago[Glitch] Fix initial value of volume slider in video player and handle volume changes
Thibaut Girka [Sun, 27 Jan 2019 21:02:59 +0000 (22:02 +0100)]
[Glitch] Fix initial value of volume slider in video player and handle volume changes

Port a53dcaa29869e808707efcba541b02ee8d799e75 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 27 Jan 2019 20:57:55 +0000 (21:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoFix initial value of volume slider in video player and handle volume changes (#9929)
ThibG [Sun, 27 Jan 2019 20:18:15 +0000 (21:18 +0100)]
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

7 years agoImplement missing hotkeys for notifications (#9927)
ThibG [Sun, 27 Jan 2019 16:54:54 +0000 (17:54 +0100)]
Implement missing hotkeys for notifications (#9927)

7 years agoMerge pull request #899 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 27 Jan 2019 13:23:24 +0000 (14:23 +0100)]
Merge pull request #899 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 27 Jan 2019 12:57:25 +0000 (13:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoRevert to storing application info, and display it to the author via API
Thibaut Girka [Mon, 21 Jan 2019 21:40:26 +0000 (22:40 +0100)]
Revert to storing application info, and display it to the author via API

7 years agoMake storing and displaying application used to toot opt-in
Thibaut Girka [Mon, 21 Jan 2019 18:36:33 +0000 (19:36 +0100)]
Make storing and displaying application used to toot opt-in

7 years agoPrevent posting toots with media attachments from someone else (#9921)
ThibG [Sat, 26 Jan 2019 22:59:39 +0000 (23:59 +0100)]
Prevent posting toots with media attachments from someone else (#9921)

7 years agoMerge pull request #897 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 26 Jan 2019 17:47:48 +0000 (18:47 +0100)]
Merge pull request #897 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 26 Jan 2019 17:32:49 +0000 (18:32 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoMerge pull request #896 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 25 Jan 2019 21:42:21 +0000 (22:42 +0100)]
Merge pull request #896 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoFix SSO authentication not working due to missing agreement boolean (#9915)
Eugen Rochko [Fri, 25 Jan 2019 11:36:54 +0000 (12:36 +0100)]
Fix SSO authentication not working due to missing agreement boolean (#9915)

Fix #9906

7 years agoFix Firefox scrollbar color regression in #9210 (#9908)
trwnh [Thu, 24 Jan 2019 12:32:23 +0000 (06:32 -0600)]
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.

7 years agoApply style for .landing-page strong (#9892)
Jeong Arm [Mon, 21 Jan 2019 19:03:44 +0000 (04:03 +0900)]
Apply style for .landing-page strong (#9892)

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 25 Jan 2019 10:37:49 +0000 (11:37 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoRescue SSL error in verify link service (#9914)
Renato "Lond" Cerqueira [Thu, 24 Jan 2019 14:38:18 +0000 (15:38 +0100)]
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.

7 years agoFix Firefox scrollbar color regression in #9210 (#9908)
trwnh [Thu, 24 Jan 2019 12:32:23 +0000 (06:32 -0600)]
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.

7 years agoMerge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash
ThibG [Wed, 23 Jan 2019 17:53:36 +0000 (18:53 +0100)]
Merge pull request #893 from ThibG/glitch-soc/fixes/dm-column-crash

Fix crash in Direct Messages column settings

7 years agoFix crash in Direct Messages column settings
Thibaut Girka [Wed, 23 Jan 2019 17:29:18 +0000 (18:29 +0100)]
Fix crash in Direct Messages column settings

Fixes #892

7 years agoBump oj from 3.7.7 to 3.7.8 (#9900)
dependabot[bot] [Tue, 22 Jan 2019 11:33:20 +0000 (20:33 +0900)]
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>
7 years agoBump rubocop from 0.63.0 to 0.63.1 (#9899)
dependabot[bot] [Tue, 22 Jan 2019 11:32:49 +0000 (20:32 +0900)]
Bump rubocop from 0.63.0 to 0.63.1 (#9899)

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>
7 years agoApply style for .landing-page strong (#9892)
Jeong Arm [Mon, 21 Jan 2019 19:03:44 +0000 (04:03 +0900)]
Apply style for .landing-page strong (#9892)

7 years agoFix scheduled toot with media immediately creating a toot (#9894)
ThibG [Mon, 21 Jan 2019 19:03:04 +0000 (20:03 +0100)]
Fix scheduled toot with media immediately creating a toot (#9894)

* Add test for not persisting status when attaching media to scheduled toot

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

Fixes #9893

Thanks to tateisu for the help investigating this.

7 years agoBump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891)
dependabot[bot] [Mon, 21 Jan 2019 12:39:52 +0000 (21:39 +0900)]
Bump json-ld-preloaded from 3.0.0 to 3.0.2 (#9891)

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>
7 years agoBump pundit from 2.0.0 to 2.0.1 (#9890)
dependabot[bot] [Mon, 21 Jan 2019 12:39:00 +0000 (21:39 +0900)]
Bump pundit from 2.0.0 to 2.0.1 (#9890)

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>
7 years agoBump rspec-rails from 3.8.1 to 3.8.2 (#9889)
dependabot[bot] [Mon, 21 Jan 2019 12:38:37 +0000 (21:38 +0900)]
Bump rspec-rails from 3.8.1 to 3.8.2 (#9889)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump addressable from 2.5.2 to 2.6.0 (#9888)
dependabot[bot] [Mon, 21 Jan 2019 12:38:00 +0000 (21:38 +0900)]
Bump addressable from 2.5.2 to 2.6.0 (#9888)

Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoMerge pull request #889 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 21 Jan 2019 10:35:31 +0000 (11:35 +0100)]
Merge pull request #889 from ThibG/glitch-soc/merge-upstream

Merge upstream changes (v2.7.0)

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 20 Jan 2019 15:49:23 +0000 (16:49 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoMerge pull request #888 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 20 Jan 2019 12:56:37 +0000 (13:56 +0100)]
Merge pull request #888 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoFix multiple workers for the same scheduled status being queueable (#9875)
Eugen Rochko [Sun, 20 Jan 2019 11:57:05 +0000 (12:57 +0100)]
Fix multiple workers for the same scheduled status being queueable (#9875)

7 years agoFix directory showing tags that have no currently eligible accounts (#9872)
Eugen Rochko [Sun, 20 Jan 2019 11:56:53 +0000 (12:56 +0100)]
Fix directory showing tags that have no currently eligible accounts (#9872)

7 years agoRemove unused locale string (#9873)
Eugen Rochko [Sun, 20 Jan 2019 11:37:58 +0000 (12:37 +0100)]
Remove unused locale string (#9873)

7 years agoi18n: Update Japanese translations (#9871)
mayaeh [Sun, 20 Jan 2019 11:37:38 +0000 (20:37 +0900)]
i18n: Update Japanese translations (#9871)

* Update Japanese translations.

* Delete unused translation.

7 years agoFix `tootctl accounts delete` not deleting user record as well (#9874)
Eugen Rochko [Sun, 20 Jan 2019 11:30:25 +0000 (12:30 +0100)]
Fix `tootctl accounts delete` not deleting user record as well (#9874)

7 years ago[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
Thibaut Girka [Sun, 20 Jan 2019 10:56:21 +0000 (11:56 +0100)]
[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation

Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc

7 years ago[Glitch] Hide floating action button on search and getting started pages
Thibaut Girka [Sun, 20 Jan 2019 10:54:38 +0000 (11:54 +0100)]
[Glitch] Hide floating action button on search and getting started pages

Port 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 to glitch-soc

7 years agoAllow event defaults on index for text data transfer (#9840)
tmm576 [Thu, 17 Jan 2019 22:27:51 +0000 (17:27 -0500)]
Allow event defaults on index for text data transfer (#9840)

7 years ago[Glitch] Fix new hashtag page's items not being full-width on mobile
Thibaut Girka [Sun, 20 Jan 2019 10:52:06 +0000 (11:52 +0100)]
[Glitch] Fix new hashtag page's items not being full-width on mobile

Port b506ce119766bb3308f934e2d3de143b3ac6f5ad to glitch-soc

7 years ago[Glitch] Add information about how to opt-in to the directory on the directory
Thibaut Girka [Sun, 20 Jan 2019 10:50:19 +0000 (11:50 +0100)]
[Glitch] Add information about how to opt-in to the directory on the directory

Port SCSS changes from a492a9bcd355d4f0998990905177ac4f9699cc3c to glitch-soc

7 years agoFix slightly cropped font on settings page dropdowns when using system font (#9839)
Mélanie Chauvel (ariasuni) [Thu, 17 Jan 2019 22:28:30 +0000 (23:28 +0100)]
Fix slightly cropped font on settings page dropdowns when using system font (#9839)

7 years ago[Glitch] Improve the public hashtag page
Thibaut Girka [Sun, 20 Jan 2019 10:47:17 +0000 (11:47 +0100)]
[Glitch] Improve the public hashtag page

Port 8b1990355974543542544e56d2046bc0c9c8716b to glitch-soc

7 years ago[Glitch] Redesign public hashtag page to use a masonry layout
Thibaut Girka [Sat, 19 Jan 2019 17:55:27 +0000 (18:55 +0100)]
[Glitch] Redesign public hashtag page to use a masonry layout

Port bc642ac24b49c14dca382e7aabbc16130293d2f4 to glitch flavour

7 years agoUpdate CHANGELOG.md
Eugen Rochko [Sat, 19 Jan 2019 23:32:39 +0000 (00:32 +0100)]
Update CHANGELOG.md

7 years agoBump version to 2.7.0
Eugen Rochko [Sat, 19 Jan 2019 23:30:53 +0000 (00:30 +0100)]
Bump version to 2.7.0

7 years agoWeblate translations (2019-01-19) (#9867)
Eugen Rochko [Sat, 19 Jan 2019 22:43:06 +0000 (23:43 +0100)]
Weblate translations (2019-01-19) (#9867)

* Translated using Weblate (Serbian)

Currently translated at 85.0% (91 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 86.9% (93 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 93.6% (707 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/

* Translated using Weblate (Greek)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Korean)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (French)

Currently translated at 99.1% (748 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Galician)

Currently translated at 100,0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Arabic)

Currently translated at 98.9% (352 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Arabic)

Currently translated at 93.5% (100 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (Arabic)

Currently translated at 92.6% (699 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 94.7% (715 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Dutch)

Currently translated at 99.5% (751 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Serbian)

Currently translated at 93.5% (100 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 96.8% (61 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/

* Translated using Weblate (Serbian)

Currently translated at 95.6% (722 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/

* Translated using Weblate (Arabic)

Currently translated at 97.2% (104 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Latvian)

Currently translated at 16.9% (60 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/

* Translated using Weblate (Indonesian)

Currently translated at 55.6% (198 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/

* Translated using Weblate (Polish)

Currently translated at 96.8% (61 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/

* Translated using Weblate (Dutch)

Currently translated at 99.1% (106 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Asturian)

Currently translated at 48.6% (52 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/

* Translated using Weblate (Italian)

Currently translated at 82.8% (625 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Slovak)

Currently translated at 99.6% (752 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (German)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/

* Translated using Weblate (German)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (Occitan)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Catalan)

Currently translated at 100,0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Occitan)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* i18n-tasks normalize

* yarn manage:translations

* Fix pluralizations

* Fix inconsistent interpolation

7 years agoAdd translators to AUTHORS.md (#9865)
Eugen Rochko [Sat, 19 Jan 2019 21:01:12 +0000 (22:01 +0100)]
Add translators to AUTHORS.md (#9865)

7 years agoFix error when `scheduled_at` attribute is malformed (#9866)
Eugen Rochko [Sat, 19 Jan 2019 21:01:01 +0000 (22:01 +0100)]
Fix error when `scheduled_at` attribute is malformed (#9866)

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 19 Jan 2019 17:28:37 +0000 (18:28 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

No conflicts.

7 years agoChange CHANGELOG.md references from pull requests to authors (#9864)
Eugen Rochko [Sat, 19 Jan 2019 15:25:20 +0000 (16:25 +0100)]
Change CHANGELOG.md references from pull requests to authors (#9864)

Add `rake repo:changelog` to do that automatically

7 years agoBump to 2.7.0rc3
Eugen Rochko [Fri, 18 Jan 2019 23:01:27 +0000 (00:01 +0100)]
Bump to 2.7.0rc3

7 years agoFix missing account association in tombstone model (#9857)
Eugen Rochko [Fri, 18 Jan 2019 22:52:09 +0000 (23:52 +0100)]
Fix missing account association in tombstone model (#9857)

7 years agoBump version to 2.7.0rc2 (#9836)
Eugen Rochko [Fri, 18 Jan 2019 21:55:01 +0000 (22:55 +0100)]
Bump version to 2.7.0rc2 (#9836)

7 years agoUse the bundled Capistrano version (#9855)
Alexander Mankuta [Fri, 18 Jan 2019 20:31:11 +0000 (22:31 +0200)]
Use the bundled Capistrano version (#9855)

7 years agoFix new hashtag page's items not being full-width on mobile (#9852)
Eugen Rochko [Fri, 18 Jan 2019 19:58:11 +0000 (20:58 +0100)]
Fix new hashtag page's items not being full-width on mobile (#9852)

Fix #9845

7 years agoFix REST API showing non-public reblogs for a given status (#9850)
Eugen Rochko [Fri, 18 Jan 2019 19:58:00 +0000 (20:58 +0100)]
Fix REST API showing non-public reblogs for a given status (#9850)

7 years agoBump json-ld from 2.2.1 to 3.0.2 (#8804)
dependabot[bot] [Fri, 18 Jan 2019 15:02:29 +0000 (16:02 +0100)]
Bump json-ld from 2.2.1 to 3.0.2 (#8804)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump brakeman from 4.3.1 to 4.4.0 (#9848)
dependabot[bot] [Fri, 18 Jan 2019 14:57:41 +0000 (15:57 +0100)]
Bump brakeman from 4.3.1 to 4.4.0 (#9848)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.3.1...v4.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoReject existing Follow in addition to sending a Block (#9811)
ThibG [Fri, 18 Jan 2019 14:57:19 +0000 (15:57 +0100)]
Reject existing Follow in addition to sending a Block (#9811)

Mastodon expects remote servers to remove follow relationships upon receiving
a Block. However, the spec only evokes Block activities in a C2S context, never
in a S2S context.

This PR, in addition to federating the Block, explicitly sends a Reject for any
affected follow relationship, which makes a bit more sense with regards to the
spec.

7 years agoAdd tombstones for remote statuses (#9830)
ThibG [Fri, 18 Jan 2019 14:56:55 +0000 (15:56 +0100)]
Add tombstones for remote statuses (#9830)

* Add Tombstone model to remember object deletion

* Do not recreate a status if it has been deleted

* Record Tombstone for remote deleted items

Also, only record deleted items from same-host actors

* Clear an user's tombstones when their key change

7 years agoAdd support for non-public reblogs from ActivityPub (#9841)
Eugen Rochko [Fri, 18 Jan 2019 14:56:21 +0000 (15:56 +0100)]
Add support for non-public reblogs from ActivityPub (#9841)

Fix #9838

7 years agoBump bundler-audit from 0.6.0 to 0.6.1 (#9847)
dependabot[bot] [Fri, 18 Jan 2019 14:23:31 +0000 (23:23 +0900)]
Bump bundler-audit from 0.6.0 to 0.6.1 (#9847)

Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases)
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md)
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.0...v0.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoAdd information about how to opt-in to the directory on the directory (#9834)
Eugen Rochko [Fri, 18 Jan 2019 09:25:44 +0000 (10:25 +0100)]
Add information about how to opt-in to the directory on the directory (#9834)

Fix #9833

7 years agoAdd timeouts for S3 (#9842)
Eugen Rochko [Fri, 18 Jan 2019 00:36:59 +0000 (01:36 +0100)]
Add timeouts for S3 (#9842)

7 years agoFix code style of regeneration-related code (#9843)
Eugen Rochko [Fri, 18 Jan 2019 00:02:51 +0000 (01:02 +0100)]
Fix code style of regeneration-related code (#9843)

7 years agoWeblate translations (2019-01-17) (#9844)
Eugen Rochko [Thu, 17 Jan 2019 23:48:09 +0000 (00:48 +0100)]
Weblate translations (2019-01-17) (#9844)

* Translated using Weblate (Welsh)

Currently translated at 94.7% (337 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Czech)

Currently translated at 99.9% (751 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Romanian)

Currently translated at 99.2% (353 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/

* Translated using Weblate (Romanian)

Currently translated at 11.8% (89 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/

* Translated using Weblate (German)

Currently translated at 99.9% (751 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (German)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* Translated using Weblate (German)

Currently translated at 99.9% (751 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (Serbian)

Currently translated at 96.8% (61 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Serbian)

Currently translated at 74.8% (80 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 98.4% (62 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/

нисам сигуран за ово "и не направите нову". слијед ријечи ми је мало чудан?

* Translated using Weblate (Serbian)

Currently translated at 75.7% (81 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

преподешавања за ПРЕСЕТ

* Translated using Weblate (Catalan)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Serbian)

Currently translated at 80.4% (86 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* i18n-tasks normalize

* yarn manage:translations

7 years agoFix slightly cropped font on settings page dropdowns when using system font (#9839)
Mélanie Chauvel (ariasuni) [Thu, 17 Jan 2019 22:28:30 +0000 (23:28 +0100)]
Fix slightly cropped font on settings page dropdowns when using system font (#9839)

7 years agoAllow event defaults on index for text data transfer (#9840)
tmm576 [Thu, 17 Jan 2019 22:27:51 +0000 (17:27 -0500)]
Allow event defaults on index for text data transfer (#9840)

7 years agoAdd `tootctl --version` (#9835)
Eugen Rochko [Thu, 17 Jan 2019 20:32:55 +0000 (21:32 +0100)]
Add `tootctl --version` (#9835)

7 years agoUpdate Dockerfile (#9796)
ashleyhull-versent [Thu, 17 Jan 2019 15:18:40 +0000 (02:18 +1100)]
Update Dockerfile (#9796)

7 years agoBump rubocop from 0.62.0 to 0.63.0 (#9827)
dependabot[bot] [Thu, 17 Jan 2019 13:21:32 +0000 (22:21 +0900)]
Bump rubocop from 0.62.0 to 0.63.0 (#9827)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.62.0 to 0.63.0.
- [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.62.0...v0.63.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump oj from 3.7.6 to 3.7.7 (#9828)
dependabot[bot] [Thu, 17 Jan 2019 13:21:01 +0000 (22:21 +0900)]
Bump oj from 3.7.6 to 3.7.7 (#9828)

Bumps [oj](https://github.com/ohler55/oj) from 3.7.6 to 3.7.7.
- [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.6...v3.7.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoImprove the public hashtag page (#9831)
Eugen Rochko [Thu, 17 Jan 2019 13:06:08 +0000 (14:06 +0100)]
Improve the public hashtag page (#9831)

- Fix height not updating when clicking show more on public hashtag page
- Add header to the public hashtag page
- Change text size and margins on the public hashtag page

7 years agoHide floating action button on search and getting started pages (#9826)
tmm576 [Thu, 17 Jan 2019 08:22:12 +0000 (03:22 -0500)]
Hide floating action button on search and getting started pages (#9826)

7 years agoFix public hashtag timeline width on mobile, fix scrollbar width compensation (#9824)
ThibG [Wed, 16 Jan 2019 19:36:10 +0000 (20:36 +0100)]
Fix public hashtag timeline width on mobile, fix scrollbar width compensation (#9824)

* Fix hashtag timeline width being potentially larger than window width

* Add automatic computation of scrollbar width

7 years agoI18n: Update Czech translation (#9814)
Aditoo17 [Wed, 16 Jan 2019 18:48:13 +0000 (19:48 +0100)]
I18n: Update Czech translation  (#9814)

* I18n: Update Czech translation

* I18n: Update Czech translation

* I18n: Update Czech translation

Small fix

7 years agoRedesign public hashtag page to use a masonry layout (#9822)
Eugen Rochko [Wed, 16 Jan 2019 18:47:46 +0000 (19:47 +0100)]
Redesign public hashtag page to use a masonry layout (#9822)

7 years agoUse summary as summary for converted ActivityPub objects (#9823)
Eugen Rochko [Wed, 16 Jan 2019 17:36:17 +0000 (18:36 +0100)]
Use summary as summary for converted ActivityPub objects (#9823)

Fix #8609

7 years agoMerge pull request #887 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 16 Jan 2019 15:28:38 +0000 (16:28 +0100)]
Merge pull request #887 from ThibG/glitch-soc/merge-upstream

Merge upstream changes