Commit graph

39700 commits

Author SHA1 Message Date
dependabot[bot]
55219f11cc 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>
2019-01-18 23:23:31 +09:00
Eugen Rochko
86087f7461 Add information about how to opt-in to the directory on the directory (#9834)
Fix #9833
2019-01-18 10:25:44 +01:00
Eugen Rochko
a492a9bcd3
Add information about how to opt-in to the directory on the directory (#9834)
Fix #9833
2019-01-18 10:25:44 +01:00
Eugen Rochko
14d49e814a Add timeouts for S3 (#9842) 2019-01-18 01:36:59 +01:00
Eugen Rochko
4699cf853c
Add timeouts for S3 (#9842) 2019-01-18 01:36:59 +01:00
Eugen Rochko
9a98e3fe76 Fix code style of regeneration-related code (#9843) 2019-01-18 01:02:51 +01:00
Eugen Rochko
69f782b54d
Fix code style of regeneration-related code (#9843) 2019-01-18 01:02:51 +01:00
Eugen Rochko
4abfcbd614 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
2019-01-18 00:48:09 +01:00
Eugen Rochko
90ff2e7608
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
2019-01-18 00:48:09 +01:00
Mélanie Chauvel (ariasuni)
06668c1959 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-17 23:28:30 +01:00
Mélanie Chauvel (ariasuni)
b8894c429a Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-17 23:28:30 +01:00
tmm576
393a56d611 Allow event defaults on index for text data transfer (#9840) 2019-01-17 23:27:51 +01:00
tmm576
4cd0a10793 Allow event defaults on index for text data transfer (#9840) 2019-01-17 23:27:51 +01:00
Eugen Rochko
73fbbd48cd Add tootctl --version (#9835) 2019-01-17 21:32:55 +01:00
Eugen Rochko
3c218cd76d
Add tootctl --version (#9835) 2019-01-17 21:32:55 +01:00
ashleyhull-versent
b1fac0b869 Update Dockerfile (#9796) 2019-01-17 16:18:40 +01:00
ashleyhull-versent
8ec539fef1 Update Dockerfile (#9796) 2019-01-17 16:18:40 +01:00
dependabot[bot]
fd28bb1403 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>
2019-01-17 22:21:32 +09:00
dependabot[bot]
451ae6896d 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>
2019-01-17 22:21:32 +09:00
dependabot[bot]
5fc38acb50 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>
2019-01-17 22:21:01 +09:00
dependabot[bot]
c476051f44 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>
2019-01-17 22:21:01 +09:00
Eugen Rochko
43014334f8 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
2019-01-17 14:06:08 +01:00
Eugen Rochko
8b19903559
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
2019-01-17 14:06:08 +01:00
tmm576
180a665f29 Hide floating action button on search and getting started pages (#9826) 2019-01-17 09:22:12 +01:00
tmm576
30af4ee65f Hide floating action button on search and getting started pages (#9826) 2019-01-17 09:22:12 +01:00
ThibG
cbb8399df4 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
2019-01-16 20:36:10 +01:00
ThibG
3b3a4d8a17 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
2019-01-16 20:36:10 +01:00
Aditoo17
4b9297ad46 I18n: Update Czech translation (#9814)
* I18n: Update Czech translation

* I18n: Update Czech translation

* I18n: Update Czech translation

Small fix
2019-01-16 19:48:13 +01:00
Aditoo17
f2f9d50a13 I18n: Update Czech translation (#9814)
* I18n: Update Czech translation

* I18n: Update Czech translation

* I18n: Update Czech translation

Small fix
2019-01-16 19:48:13 +01:00
Eugen Rochko
380b246728 Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00
Eugen Rochko
bc642ac24b
Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00
Eugen Rochko
9b0c7cfa6f Use summary as summary for converted ActivityPub objects (#9823)
Fix #8609
2019-01-16 18:36:17 +01:00
Eugen Rochko
4ab42287c0
Use summary as summary for converted ActivityPub objects (#9823)
Fix #8609
2019-01-16 18:36:17 +01:00
ThibG
e498e5faeb Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-16 16:28:38 +01:00
ThibG
530d29148c
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-16 16:28:38 +01:00
Eugen Rochko
7a4958b028 Fix tootctl domains crawl with JSON format output crash (#9820)
Fix #9817
2019-01-16 15:47:55 +01:00
Eugen Rochko
59e3a7f87b
Fix tootctl domains crawl with JSON format output crash (#9820)
Fix #9817
2019-01-16 15:47:55 +01:00
ThibG
b8867a3412 Reduce chances of race conditions when processing deleted toots (#9815)
* Reduce chances of race conditions when processing deleted toots

* Prevent race condition when processing deleted toots
2019-01-16 15:42:00 +01:00
ThibG
a4f07bad95 Reduce chances of race conditions when processing deleted toots (#9815)
* Reduce chances of race conditions when processing deleted toots

* Prevent race condition when processing deleted toots
2019-01-16 15:42:00 +01:00
Thibaut Girka
8ea1a8e033 [Glitch] make draggingOver state off correctly
Port e77cb61481 to glitch-soc
2019-01-16 14:50:17 +01:00
Thibaut Girka
5684cd090c [Glitch] make draggingOver state off correctly
Port d6433b3931 to glitch-soc
2019-01-16 14:50:17 +01:00
Thibaut Girka
426673f17a [Glitch] Make hashtag search results link to the hashtag URL
Port 65c546f9b0 to glitch-soc
2019-01-16 14:25:58 +01:00
Thibaut Girka
92830029ca [Glitch] Make hashtag search results link to the hashtag URL
Port 6cfb357940 to glitch-soc
2019-01-16 14:25:58 +01:00
Thibaut Girka
1c67a27069 [Glitch] Fix hashtag timeline on mobile
Port 8044612d15 to glitch-soc
2019-01-16 14:24:23 +01:00
Thibaut Girka
ad32896a93 [Glitch] Fix hashtag timeline on mobile
Port c5b8824a3e to glitch-soc
2019-01-16 14:24:23 +01:00
Thibaut Girka
a06d3a6082 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
Thibaut Girka
dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
Daigo 3 Dango
3fa07a632e User ruby2.6.0 on Heroku (#9818) 2019-01-15 23:11:59 +01:00
Daigo 3 Dango
5363c724fc User ruby2.6.0 on Heroku (#9818) 2019-01-15 23:11:59 +01:00
Moritz Heiber
f2cefd9d73 Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819) 2019-01-15 23:11:46 +01:00