]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years ago[Glitch] Allow multiple files upload through web UI, including drag & drop
Thibaut Girka [Sun, 10 Feb 2019 20:35:04 +0000 (21:35 +0100)]
[Glitch] Allow multiple files upload through web UI, including drag & drop

Port 750c67660de753065ec160b4e389ba0dda2f81cc to glitch-soc

7 years ago[Glitch] Add missing rejection handling for Promises
Thibaut Girka [Sun, 10 Feb 2019 20:28:29 +0000 (21:28 +0100)]
[Glitch] Add missing rejection handling for Promises

Port missing parts from 2c51bc0ca5a4c3a4bb140b4b40dabdda859ebb94 to glitch-soc

7 years ago[Glitch] Add WebP support
Thibaut Girka [Sun, 10 Feb 2019 20:13:17 +0000 (21:13 +0100)]
[Glitch] Add WebP support

Port 5092d17f2936146fa26e5d8a9b9e391f77010f28  to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 10 Feb 2019 19:57:51 +0000 (20:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.

7 years agoBump parallel_tests from 2.27.1 to 2.28.0 (#9985)
dependabot[bot] [Sun, 10 Feb 2019 17:17:34 +0000 (18:17 +0100)]
Bump parallel_tests from 2.27.1 to 2.28.0 (#9985)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoi18n: add Japanese translations (#10000)
mayaeh [Sun, 10 Feb 2019 12:04:59 +0000 (21:04 +0900)]
i18n: add Japanese translations (#10000)

* Add Japanese translations.

* Probably change to more general "統合" than "マージ" .

7 years agoFix URL linkifier grabbing full-width spaces and quotations (#9997)
Eugen Rochko [Sat, 9 Feb 2019 19:13:11 +0000 (20:13 +0100)]
Fix URL linkifier grabbing full-width spaces and quotations (#9997)

Fix #9993
Fix #5654

7 years agoEnable "displaying application used to post" setting by default (#9994)
rinsuki [Sat, 9 Feb 2019 16:33:41 +0000 (01:33 +0900)]
Enable "displaying application used to post" setting by default (#9994)

related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615

7 years ago Only URLs extract with pre-escaped text (#9991)
Hinaloe [Sat, 9 Feb 2019 02:39:38 +0000 (11:39 +0900)]
 Only URLs extract with pre-escaped text (#9991)

* [test] add japanese hashtag testcase

* Only URLs extract with pre-escaped text

( https://github.com/tootsuite/mastodon/issues/9989 )

7 years agoFix IntersectionObserverArticle not hiding some out-of-view items (#9982)
ThibG [Wed, 6 Feb 2019 22:36:43 +0000 (23:36 +0100)]
Fix IntersectionObserverArticle not hiding some out-of-view items (#9982)

IntersectionObserverArticle is made to save on RAM by avoiding fully rendering
items that are far out of view. However, it did not work for items spawned
outside the intersection observer.

7 years agoBump microformats from 4.0.7 to 4.1.0 (#9980)
dependabot[bot] [Wed, 6 Feb 2019 15:46:37 +0000 (16:46 +0100)]
Bump microformats from 4.0.7 to 4.1.0 (#9980)

Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0.
- [Release notes](https://github.com/microformats/microformats-ruby/releases)
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoFix CW unfolding not triggering re-layout in public hashtag page
Thibaut Girka [Wed, 6 Feb 2019 14:11:46 +0000 (15:11 +0100)]
Fix CW unfolding not triggering re-layout in public hashtag page

7 years agoFix unfolding CWs on public hashtag page
Thibaut Girka [Wed, 6 Feb 2019 13:13:15 +0000 (14:13 +0100)]
Fix unfolding CWs on public hashtag page

Fixes #909

7 years agoFix Tombstone.delete_all ArgumentError (#9978)
abcang [Wed, 6 Feb 2019 01:50:52 +0000 (10:50 +0900)]
Fix Tombstone.delete_all ArgumentError (#9978)

7 years agoRename from instance to server. (#9938)
mayaeh [Tue, 5 Feb 2019 18:11:24 +0000 (03:11 +0900)]
Rename from instance to server. (#9938)

7 years agoi18n: Update Polish translation 🇵 (#9974)
marcin mikołajczak [Tue, 5 Feb 2019 14:13:34 +0000 (15:13 +0100)]
i18n: Update Polish translation 🇵 (#9974)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoDo not use apk cache and upgrade (#9966)
J0WI [Tue, 5 Feb 2019 14:13:19 +0000 (15:13 +0100)]
Do not use apk cache and upgrade (#9966)

7 years agoReplace LibreSSL by OpenSSL (#9975)
J0WI [Tue, 5 Feb 2019 14:12:45 +0000 (15:12 +0100)]
Replace LibreSSL by OpenSSL (#9975)

7 years agoHide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)
ThibG [Tue, 5 Feb 2019 14:11:35 +0000 (15:11 +0100)]
Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)

Thanks @wryk for noticing this issue.

7 years agoFix it as tagged_request of accounts_controller is not addressable_uri (#9976)
Takeshi Umeda [Tue, 5 Feb 2019 14:11:11 +0000 (23:11 +0900)]
Fix it as tagged_request of accounts_controller is not addressable_uri (#9976)

7 years agoUpdate Dockerfile (#9965)
ashleyhull-versent [Tue, 5 Feb 2019 04:11:51 +0000 (15:11 +1100)]
Update Dockerfile (#9965)

7 years ago[UI] Fix whitespace being applied to div instead of p (#9968)
trwnh [Tue, 5 Feb 2019 03:46:18 +0000 (21:46 -0600)]
[UI] Fix whitespace being applied to div instead of p (#9968)

* fix large line breaks

* fix ascii art posts

7 years agoFix pinned statuses being shown in a featured hashtag (#9971)
Eugen Rochko [Mon, 4 Feb 2019 23:27:18 +0000 (00:27 +0100)]
Fix pinned statuses being shown in a featured hashtag (#9971)

7 years agoFix not showing custom emojis in share page emoji picker (#9970)
rinsuki [Mon, 4 Feb 2019 22:14:57 +0000 (07:14 +0900)]
Fix not showing custom emojis in share page emoji picker (#9970)

7 years agoFix authorized applications list page design (#9969)
rinsuki [Mon, 4 Feb 2019 21:25:42 +0000 (06:25 +0900)]
Fix authorized applications list page design (#9969)

7 years agoUse video filesize limit with gifv (#9924)
rinsuki [Mon, 4 Feb 2019 03:46:05 +0000 (12:46 +0900)]
Use video filesize limit with gifv (#9924)

7 years agochange "finish tutorial" text to "finish toot-orial" (#9905)
mike castleman [Mon, 4 Feb 2019 03:45:29 +0000 (01:45 -0200)]
change "finish tutorial" text to "finish toot-orial" (#9905)

7 years agoAdd featured hashtags to profiles (#9755)
Eugen Rochko [Mon, 4 Feb 2019 03:25:59 +0000 (04:25 +0100)]
Add featured hashtags to profiles (#9755)

* Add hashtag filter to profiles

GET /@:username/tagged/:hashtag
GET /api/v1/accounts/:id/statuses?tagged=:hashtag

* Display featured hashtags on public profile

* Use separate model for featured tags

* Update featured hashtag counters on-write

* Limit featured tags to 10

7 years agoAdd option to overwrite imported data (#9962)
Eugen Rochko [Sun, 3 Feb 2019 02:59:51 +0000 (03:59 +0100)]
Add option to overwrite imported data (#9962)

* Add option to overwrite imported data

Fix #7465

* Add import for domain blocks

7 years agoBump capybara from 3.12.0 to 3.13.2 (#9935)
dependabot[bot] [Sun, 3 Feb 2019 02:40:40 +0000 (03:40 +0100)]
Bump capybara from 3.12.0 to 3.13.2 (#9935)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2.
- [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.12.0...3.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump httplog from 1.2.0 to 1.2.1 (#9942)
dependabot[bot] [Sun, 3 Feb 2019 02:40:22 +0000 (03:40 +0100)]
Bump httplog from 1.2.0 to 1.2.1 (#9942)

Bumps [httplog](https://github.com/trusche/httplog) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoRemove redundant “options” from “Compose box options”
Thibaut Girka [Sat, 2 Feb 2019 23:34:52 +0000 (00:34 +0100)]
Remove redundant “options” from “Compose box options”

Thanks @ariasuni.

7 years agoMinor description corrections
Marek Ľach [Sat, 2 Feb 2019 12:43:51 +0000 (13:43 +0100)]
Minor description corrections

7 years agoAllow multiple files upload through web UI, including drag & drop (#9856)
tmm576 [Sat, 2 Feb 2019 19:22:05 +0000 (14:22 -0500)]
Allow multiple files upload through web UI, including drag & drop (#9856)

* Allow drag and drop uploads of multiple files to compose

* Calculate aggregate upload progress for single action

* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback

7 years agoRe-enable ignored translations that is needed (#7842)
Jeong Arm [Sat, 2 Feb 2019 18:37:16 +0000 (03:37 +0900)]
Re-enable ignored translations that is needed (#7842)

Some of strings should be translated.

7 years agoMake displaying application used to toot opt-in (#9897)
ThibG [Sat, 2 Feb 2019 18:18:15 +0000 (19:18 +0100)]
Make displaying application used to toot opt-in (#9897)

* Make storing and displaying application used to toot opt-in

* Revert to storing application info, and display it to the author via API

7 years agoCreate Redisable#redis (#9633)
ysksn [Sat, 2 Feb 2019 18:11:38 +0000 (03:11 +0900)]
Create Redisable#redis (#9633)

* Create Redisable

* Use #redis instead of Redis.current

7 years agoAllow most kinds of characters in URL query (fixes #8408) (#8447)
Jakub Mendyk [Sat, 2 Feb 2019 18:01:18 +0000 (19:01 +0100)]
Allow most kinds of characters in URL query (fixes #8408) (#8447)

* Allow unicode characters in URL query strings

Fixes #8408

* Alternative approach to unicode support in urls

Adds PoC/idea to approch this problem.

7 years agoAdd WebP support (#9879)
Acid Chicken (硫酸鶏) [Sat, 2 Feb 2019 11:25:04 +0000 (20:25 +0900)]
Add WebP support (#9879)

* Add WebP support

* Remove the changes to the tooltip

refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528

7 years agoUpgrade new Web Share Target API (#9963)
gol-cha [Sat, 2 Feb 2019 00:26:49 +0000 (09:26 +0900)]
Upgrade new Web Share Target API (#9963)

* Update manifest.json for new Web Share Target API.

* fix code formatting

7 years agoMerge pull request #904 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 1 Feb 2019 17:24:36 +0000 (18:24 +0100)]
Merge pull request #904 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

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 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