]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agodockerfile: Give more stack space to /sbin/tini.
David Yip [Fri, 22 Dec 2017 00:07:02 +0000 (00:07 +0000)]
dockerfile: Give more stack space to /sbin/tini.

/sbin/tini ends up running the Sass compiler, which seems to need a
larger thread stack size than the musl default.  This patch incorporates
a fix from
https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c,
as described in https://github.com/sass/node-sass/issues/2031.

8 years agoMerge pull request #316 from glitch-soc/fix-async
David Yip [Wed, 10 Jan 2018 00:30:45 +0000 (18:30 -0600)]
Merge pull request #316 from glitch-soc/fix-async

Fix glitch async chunks

8 years agoRenamed glitch async chunks
kibigo! [Wed, 10 Jan 2018 00:26:14 +0000 (16:26 -0800)]
Renamed glitch async chunks

8 years agoMerge pull request #314 from chriswmartin/merge-vanilla-updates-2
David Yip [Tue, 9 Jan 2018 23:01:23 +0000 (17:01 -0600)]
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2

Merge vanilla updates into glitch - round 2

8 years agoMerge remote-tracking branch 'origin/master' into merge-upstream
David Yip [Tue, 9 Jan 2018 20:16:45 +0000 (14:16 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
db/schema.rb

8 years agoSkip ActivityPub Announces of non-public objects (#6230)
Eugen Rochko [Tue, 9 Jan 2018 18:35:10 +0000 (19:35 +0100)]
Skip ActivityPub Announces of non-public objects (#6230)

* Skip ActivityPub Announces of non-public objects

* Skip OStatus reblogs of non-public statuses

8 years agoFix #6204: Use content warning for page title when present (#6231)
Eugen Rochko [Tue, 9 Jan 2018 18:34:58 +0000 (19:34 +0100)]
Fix #6204: Use content warning for page title when present (#6231)

8 years agoRefactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223)
cwm [Tue, 9 Jan 2018 16:51:14 +0000 (10:51 -0600)]
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223)

8 years agoFix overflowing audit logs (tootsuite pr #6184)
cwm [Tue, 9 Jan 2018 16:40:14 +0000 (10:40 -0600)]
Fix overflowing audit logs (tootsuite pr #6184)

8 years agoSet background to the navigation of Getting Started column (tootsuite pr #6163)
cwm [Tue, 9 Jan 2018 16:37:27 +0000 (10:37 -0600)]
Set background to the navigation of Getting Started column (tootsuite pr #6163)

8 years agoUse const instead of let for constant (tootsuite pr #6106)
cwm [Tue, 9 Jan 2018 16:35:36 +0000 (10:35 -0600)]
Use const instead of let for constant (tootsuite pr #6106)

8 years agoIncrease rate limit on protected paths (#6229)
Eugen Rochko [Tue, 9 Jan 2018 16:07:54 +0000 (17:07 +0100)]
Increase rate limit on protected paths (#6229)

Previously each protected path had a separate rate limit. Now they're all in the same bucket, so people are more likely to hit one with register->login. Increasing to 25 per 5 minutes should be fine.

8 years agochange key to path in timeline settings containers
cwm [Tue, 9 Jan 2018 15:58:40 +0000 (09:58 -0600)]
change key to path in timeline settings containers

8 years agoRename key to path in actions and reducers for settings (tootsuite pr #6105)
cwm [Tue, 9 Jan 2018 15:48:14 +0000 (09:48 -0600)]
Rename key to path in actions and reducers for settings (tootsuite pr #6105)

8 years agoFix newlines-to-spaces functionality (tootsuite pr #6158)
cwm [Tue, 9 Jan 2018 14:52:14 +0000 (08:52 -0600)]
Fix newlines-to-spaces functionality (tootsuite pr #6158)

8 years agoHide moved account's follow button in search result (tootsuite pr #5913)
cwm [Tue, 9 Jan 2018 14:50:55 +0000 (08:50 -0600)]
Hide moved account's follow button in search result (tootsuite pr #5913)

8 years agoPrevent duplicate load of favourites (tootsuite pr #5931)
cwm [Tue, 9 Jan 2018 14:46:35 +0000 (08:46 -0600)]
Prevent duplicate load of favourites (tootsuite pr #5931)

8 years agoadd index on statuses for /api/v1/accounts/:account_id/statuses (#6202)
takayamaki [Tue, 9 Jan 2018 14:00:19 +0000 (23:00 +0900)]
add index on statuses for /api/v1/accounts/:account_id/statuses (#6202)

8 years agoRussian language update (#6227)
Evgeny Petrov [Tue, 9 Jan 2018 13:59:19 +0000 (16:59 +0300)]
Russian language update (#6227)

* Russian language update

New strings translated, except "terms" key.
Should this be translated? Can it be changed by end user?

* Removed double quotes in "terms" -> "title" key

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Tue, 9 Jan 2018 12:17:16 +0000 (12:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoWeblate translations (#6228)
Renato "Lond" Cerqueira [Tue, 9 Jan 2018 11:30:28 +0000 (09:30 -0200)]
Weblate translations (#6228)

* Translated using Weblate (Catalan)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (523 of 525 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (525 of 525 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 80.3% (45 of 56 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 83.9% (47 of 56 strings)

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

* Translated using Weblate (Persian)

Currently translated at 87.6% (460 of 525 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 99.2% (521 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/

* Translated using Weblate (Portuguese)

Currently translated at 47.2% (248 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 48.0% (252 of 525 strings)

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

* Translated using Weblate (Persian)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (525 of 525 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.0% (520 of 525 strings)

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

* Translated using Weblate (Persian)

Currently translated at 90.4% (475 of 525 strings)

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

* Translated using Weblate (Polish)

Currently translated at 99.8% (524 of 525 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Polish)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Persian)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Persian)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Polish)

Currently translated at 99.8% (524 of 525 strings)

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

* Translated using Weblate (Persian)

Currently translated at 99.8% (524 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 48.3% (254 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 56.5% (297 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 59.4% (312 of 525 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/

* Translated using Weblate (Arabic)

Currently translated at 91.0% (51 of 56 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 59.6% (313 of 525 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.6% (523 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 67.6% (355 of 525 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 98.2% (55 of 56 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 51.1% (22 of 43 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/

* Added translation using Weblate (Galician)

* Added translation using Weblate (Galician)

* Translated using Weblate (Galician)

Currently translated at 50.0% (1 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (43 of 43 strings)

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

* Added translation using Weblate (Galician)

* Translated using Weblate (Galician)

Currently translated at 24.0% (126 of 525 strings)

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

* Added translation using Weblate (Portuguese)

* Translated using Weblate (Arabic)

Currently translated at 55.2% (290 of 525 strings)

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

* Translated using Weblate (Galician)

Currently translated at 42.6% (224 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 80.9% (425 of 525 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 62.7% (27 of 43 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 100.0% (56 of 56 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 100.0% (2 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/

* Translated using Weblate (Portuguese)

Currently translated at 81.3% (427 of 525 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (2 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/

* Translated using Weblate (Galician)

Currently translated at 99.8% (524 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 93.7% (492 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 95.4% (501 of 525 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (525 of 525 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99.8% (524 of 525 strings)

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

* Translated using Weblate (Galician)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (525 of 525 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 96.0% (504 of 525 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (257 of 257 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 69.7% (30 of 43 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 97.9% (514 of 525 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (523 of 525 strings)

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

* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations

* Add back simple_forms removed by weblate
Weblate for some reason removed this files, add back to their previous
versions

* Remove linebreak on doorkeeper.pt.yml
PR review

8 years agoMerge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Tue, 9 Jan 2018 05:20:39 +0000 (23:20 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

8 years agoMerge pull request #312 from glitch-soc/tag-sensitive-imgs
David Yip [Tue, 9 Jan 2018 05:19:14 +0000 (23:19 -0600)]
Merge pull request #312 from glitch-soc/tag-sensitive-imgs

Show SENSITIVE tag on sensitive images (#267)

8 years agoMerge pull request #311 from glitch-soc/dont-show-solo-skins
David Yip [Tue, 9 Jan 2018 05:18:30 +0000 (23:18 -0600)]
Merge pull request #311 from glitch-soc/dont-show-solo-skins

Don't show skins selector when there's only one (#256)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Tue, 9 Jan 2018 05:17:13 +0000 (05:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoMerge pull request #310 from glitch-soc/fix-thread-inheritance
David Yip [Tue, 9 Jan 2018 05:15:58 +0000 (23:15 -0600)]
Merge pull request #310 from glitch-soc/fix-thread-inheritance

Threads now inherit privacy directly (#309)

8 years agoAdd missing comma
kibigo! [Tue, 9 Jan 2018 02:38:28 +0000 (18:38 -0800)]
Add missing comma

8 years agoShow SENSITIVE tag on sensitive images (#267)
kibigo! [Tue, 9 Jan 2018 02:25:29 +0000 (18:25 -0800)]
Show SENSITIVE tag on sensitive images (#267)

8 years agoDon't show skins selector when there's only one (#256)
kibigo! [Tue, 9 Jan 2018 00:45:32 +0000 (16:45 -0800)]
Don't show skins selector when there's only one (#256)

8 years agoThreads now inherit privacy directly (#309)
kibigo! [Tue, 9 Jan 2018 00:35:01 +0000 (16:35 -0800)]
Threads now inherit privacy directly (#309)

8 years agoAdd the author of a status to cc if reblogged (#6226)
puckipedia [Mon, 8 Jan 2018 23:47:43 +0000 (00:47 +0100)]
Add the author of a status to cc if reblogged (#6226)

This makes slightly more sense, and ensures that the author of a post is always referenced in the audience (which some servers might rely on). And the announce is POSTed to the author's inbox anyways.

8 years agoRefactor /api/web APIs to use the centralized axios instance (#6223)
nightpool [Mon, 8 Jan 2018 19:01:33 +0000 (14:01 -0500)]
Refactor /api/web APIs to use the centralized axios instance (#6223)

Also adds the ability to decouple the centralized axios logic from the
state dispatcher

8 years agoBump version to 2.1.3
Eugen Rochko [Mon, 8 Jan 2018 18:15:31 +0000 (19:15 +0100)]
Bump version to 2.1.3

8 years agoMerge pull request #308 from KnzkDev/fix/list-editor
beatrix [Mon, 8 Jan 2018 18:08:11 +0000 (13:08 -0500)]
Merge pull request #308 from KnzkDev/fix/list-editor

Fix list editor design

8 years agofix list editor scss
ncls7615 [Mon, 8 Jan 2018 17:50:24 +0000 (02:50 +0900)]
fix list editor scss

8 years agoMerge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Mon, 8 Jan 2018 15:48:42 +0000 (09:48 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

8 years agoWhen pulling out max_toot_chars, handle nulls
David Yip [Mon, 8 Jan 2018 15:43:57 +0000 (09:43 -0600)]
When pulling out max_toot_chars, handle nulls

flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences.  This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access.  All values exported from that module must
therefore expect that case; previously, the max chars value didn't.

Addresses #306.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Mon, 8 Jan 2018 10:17:15 +0000 (10:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoRevert #5772 (#6221)
Eugen Rochko [Mon, 8 Jan 2018 09:57:52 +0000 (10:57 +0100)]
Revert #5772 (#6221)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Mon, 8 Jan 2018 04:17:11 +0000 (04:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix bad URL schemes being accepted (#6219)
Eugen Rochko [Mon, 8 Jan 2018 04:00:23 +0000 (05:00 +0100)]
Fix bad URL schemes being accepted (#6219)

* Fix actors accepting invalid URI schemes or different host between URI and URL

* Fix statuses accepting invalid URI scheme or different host to actor

* Adjust tests to new requirements

* Improve readability of mismatching_origin?/invalid_origin? methods

8 years agoDo not display elephant friend in single-column layout (#6222)
Eugen Rochko [Mon, 8 Jan 2018 02:50:53 +0000 (03:50 +0100)]
Do not display elephant friend in single-column layout (#6222)

8 years agoMove Article from supported to converted types (#6218)
puckipedia [Sun, 7 Jan 2018 23:21:14 +0000 (00:21 +0100)]
Move Article from supported to converted types (#6218)

8 years agoMerge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Sun, 7 Jan 2018 19:30:52 +0000 (13:30 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

8 years agoUse error pack when rendering error pages. Fixes #305.
David Yip [Sun, 7 Jan 2018 19:30:17 +0000 (13:30 -0600)]
Use error pack when rendering error pages.  Fixes #305.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 7 Jan 2018 15:17:13 +0000 (15:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix force_ssl conditional (#6201)
Yamagishi Kazutoshi [Sun, 7 Jan 2018 14:19:23 +0000 (23:19 +0900)]
Fix force_ssl conditional (#6201)

8 years agoFix unintended cache (#6214)
Yamagishi Kazutoshi [Sun, 7 Jan 2018 14:12:59 +0000 (23:12 +0900)]
Fix unintended cache (#6214)

8 years agoUpdate Simplified Chinese translations (#6215)
SerCom_KC [Sun, 7 Jan 2018 08:32:50 +0000 (16:32 +0800)]
Update Simplified Chinese translations (#6215)

* i18n: (zh-CN) Add translations of #6125

* i18n: (zh-CN) Add translations of #6132

* i18n: (zh-CN) Add translations of #6099

* i18n: (zh-CN) Add translations of #6071

* i18n: (zh-CN) Improve translations

8 years agoMerge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
David Yip [Sun, 7 Jan 2018 06:32:24 +0000 (00:32 -0600)]
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master

8 years agoFix unintended cache
Yamagishi Kazutoshi [Sun, 7 Jan 2018 05:53:27 +0000 (14:53 +0900)]
Fix unintended cache

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 7 Jan 2018 02:17:10 +0000 (02:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoTranslate Korean (#6212)
Jeong Arm [Sun, 7 Jan 2018 02:13:42 +0000 (11:13 +0900)]
Translate Korean (#6212)

8 years agoFixes to search dropdown
kibigo! [Sat, 6 Jan 2018 23:34:01 +0000 (15:34 -0800)]
Fixes to search dropdown

8 years agofix typo in vanilla names.yml
beatrix [Sat, 6 Jan 2018 21:49:53 +0000 (16:49 -0500)]
fix typo in vanilla names.yml

8 years agofixed ctrl enter
Ondřej Hruška [Sat, 6 Jan 2018 18:58:04 +0000 (19:58 +0100)]
fixed ctrl enter

8 years agoFix the always-threaded bug
Ondřej Hruška [Sat, 6 Jan 2018 18:55:53 +0000 (19:55 +0100)]
Fix the always-threaded bug

8 years agotighten csp
beatrix-bitrot [Sat, 6 Jan 2018 18:49:03 +0000 (18:49 +0000)]
tighten csp

8 years agoMerge pull request #303 from KnzkDev/ja-for-thread-mode
beatrix [Sat, 6 Jan 2018 17:06:17 +0000 (12:06 -0500)]
Merge pull request #303 from KnzkDev/ja-for-thread-mode

Update ja.js for #296

8 years agoUpdate ja.js
ncls7615 [Sat, 6 Jan 2018 16:51:49 +0000 (01:51 +0900)]
Update ja.js

8 years agoMerge pull request #296 from glitch-soc/thread-mode
beatrix [Sat, 6 Jan 2018 16:28:36 +0000 (11:28 -0500)]
Merge pull request #296 from glitch-soc/thread-mode

Threaded mode~

8 years agoMerge pull request #302 from KnzkDev/fix/search-popout
beatrix [Sat, 6 Jan 2018 16:25:59 +0000 (11:25 -0500)]
Merge pull request #302 from KnzkDev/fix/search-popout

Fix search popout

8 years agoappease eslint
beatrix [Sat, 6 Jan 2018 15:30:49 +0000 (10:30 -0500)]
appease eslint

8 years agoFix search popout
ncls7615 [Sat, 6 Jan 2018 12:50:11 +0000 (21:50 +0900)]
Fix search popout

8 years agoRead max_toot_chars from root object. Fixes #297.
David Yip [Sat, 6 Jan 2018 09:01:11 +0000 (03:01 -0600)]
Read max_toot_chars from root object.  Fixes #297.

max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)

8 years agomy global .gitignore excluded this file ;_;
kibigo! [Sat, 6 Jan 2018 05:40:02 +0000 (21:40 -0800)]
my global .gitignore excluded this file ;_;

8 years agoThreaded mode~
kibigo! [Sat, 6 Jan 2018 02:23:06 +0000 (18:23 -0800)]
Threaded mode~

8 years agoFixed improper dropdown func binding for #293 + toot button spacing
kibigo! [Sat, 6 Jan 2018 05:02:53 +0000 (21:02 -0800)]
Fixed improper dropdown func binding for #293 + toot button spacing

8 years agoStyling and autosuggest fixes for #293
kibigo! [Sat, 6 Jan 2018 04:04:13 +0000 (20:04 -0800)]
Styling and autosuggest fixes for #293

8 years agoFixes composer mounting issue with #293
kibigo! [Sat, 6 Jan 2018 02:30:06 +0000 (18:30 -0800)]
Fixes composer mounting issue with #293

8 years agoMerge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Fri, 5 Jan 2018 23:31:56 +0000 (17:31 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

8 years agoMerge pull request #290 from chriswmartin/web-push-updates
beatrix [Fri, 5 Jan 2018 23:29:57 +0000 (18:29 -0500)]
Merge pull request #290 from chriswmartin/web-push-updates

Web push updates

8 years agoMerge pull request #295 from chriswmartin/getting-started-key-fix
beatrix [Fri, 5 Jan 2018 23:29:40 +0000 (18:29 -0500)]
Merge pull request #295 from chriswmartin/getting-started-key-fix

unique ColumnLink keys in getting_started

8 years agoMerge pull request #293 from glitch-soc/compose-refactor
beatrix [Fri, 5 Jan 2018 23:29:08 +0000 (18:29 -0500)]
Merge pull request #293 from glitch-soc/compose-refactor

Compose refactor

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 5 Jan 2018 22:17:12 +0000 (22:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix PuSH workers (#6200)
ThibG [Fri, 5 Jan 2018 22:04:35 +0000 (23:04 +0100)]
Fix PuSH workers (#6200)

8 years agoWhen fetching an ActivityPub-enabled status, do not re-request it as text/html (...
ThibG [Fri, 5 Jan 2018 21:42:50 +0000 (22:42 +0100)]
When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)

8 years agoRepresent numbers by strings in instance activity API (#6198)
TheKinrar [Fri, 5 Jan 2018 21:38:33 +0000 (22:38 +0100)]
Represent numbers by strings in instance activity API (#6198)

Fixes #6197.

8 years agoFix enforce HTTPS in production. (#6180)
Naoki Kosaka [Fri, 5 Jan 2018 19:04:22 +0000 (04:04 +0900)]
Fix enforce HTTPS in production. (#6180)

8 years agoMerge pull request #243 from m4sk1n/glitch-pl
beatrix [Fri, 5 Jan 2018 17:36:53 +0000 (12:36 -0500)]
Merge pull request #243 from m4sk1n/glitch-pl

i18n: 🇵🇱

8 years agoadd key to lists div
cwm [Fri, 5 Jan 2018 15:00:48 +0000 (09:00 -0600)]
add key to lists div

8 years agochange how list ColumnLink keys are determined
cwm [Fri, 5 Jan 2018 14:12:34 +0000 (08:12 -0600)]
change how list ColumnLink keys are determined

8 years agol10n Occitan language: mailer update (#6193)
Quenty31 [Fri, 5 Jan 2018 09:59:43 +0000 (10:59 +0100)]
l10n Occitan language: mailer update (#6193)

* Create email_changed.oc.html.erb

* Create email_changed.oc.text.erb

* Update email_changed.oc.html.erb

* Update email_changed.oc.html.erb

* Create reconfirmation_instructions.oc.html.erb

* Create reconfirmation_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update reconfirmation_instructions.oc.html.erb

* Update reconfirmation_instructions.oc.text.erb

* Update reconfirmation_instructions.oc.html.erb

8 years agoWIP <Compose> Refactor; Fin~
kibigo! [Fri, 5 Jan 2018 05:17:30 +0000 (21:17 -0800)]
WIP <Compose> Refactor; Fin~

8 years agoBump version to 2.1.2
Eugen Rochko [Fri, 5 Jan 2018 03:52:06 +0000 (04:52 +0100)]
Bump version to 2.1.2

8 years agoFix RFC 5646 Regular Expression (#6190)
Yamagishi Kazutoshi [Fri, 5 Jan 2018 03:43:50 +0000 (12:43 +0900)]
Fix RFC 5646 Regular Expression (#6190)

8 years agoWIP <Compose> Refactor; 1000 tiny edits
kibigo! [Wed, 3 Jan 2018 20:36:21 +0000 (12:36 -0800)]
WIP <Compose> Refactor; 1000 tiny edits

8 years agoWIP <Compose> Refactor; <ActionsModal>; dropdowns
kibigo! [Sat, 30 Dec 2017 00:32:13 +0000 (16:32 -0800)]
WIP <Compose> Refactor; <ActionsModal>; dropdowns

8 years agoWIP <Compose> Refactor; SCSS ed.
kibigo! [Fri, 29 Dec 2017 22:55:06 +0000 (14:55 -0800)]
WIP <Compose> Refactor; SCSS ed.

8 years agoWIP <Compose> Refactor; <OnboardingModal> ed.
kibigo! [Wed, 27 Dec 2017 22:28:41 +0000 (14:28 -0800)]
WIP <Compose> Refactor; <OnboardingModal> ed.

8 years agoWIP <Compose> Refactor; <Drawer> ed.
kibigo! [Wed, 27 Dec 2017 00:54:28 +0000 (16:54 -0800)]
WIP <Compose> Refactor; <Drawer> ed.

8 years agoWIPgit status <Compose> Refactor; <Composer> ed.
kibigo! [Sun, 24 Dec 2017 06:16:45 +0000 (22:16 -0800)]
WIPgit status <Compose> Refactor; <Composer> ed.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 4 Jan 2018 23:17:11 +0000 (23:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoSmall translation fixes for Serbian (and sr@Latn too) (#6188)
Branko Kokanovic [Thu, 4 Jan 2018 23:16:06 +0000 (23:16 +0000)]
Small translation fixes for Serbian (and sr@Latn too) (#6188)

8 years agoFix email confirmation link not updating email (#6187)
Patrick Figel [Thu, 4 Jan 2018 23:15:35 +0000 (00:15 +0100)]
Fix email confirmation link not updating email (#6187)

A change introduced in #6125 prevents
`Devise::Models::Confirmable#confirm` from being called for existing
users, which in turn leads to `email` not being set to
`unconfirmed_email`, breaking email updates. This also adds a test
that would've caught this issue.

8 years agoFix overflowing audit logs (#6184)
Lynx Kotoura [Thu, 4 Jan 2018 18:38:46 +0000 (03:38 +0900)]
Fix overflowing audit logs (#6184)

8 years agoUse disable_ddl_transaction! to prevent warnings on migration (#6183)
unarist [Thu, 4 Jan 2018 18:38:29 +0000 (03:38 +0900)]
Use disable_ddl_transaction! to prevent warnings on migration (#6183)

Migration is wrapped by transaction, so manual `commit_db_transaction` without transaction restarting causes "there is no transaction in progress" warnings. We should use `disable_ddl_transaction!` instead, if we can omit transaction completely.

8 years agoBump version to 2.1.1 (#6164)
Eugen Rochko [Thu, 4 Jan 2018 15:40:26 +0000 (16:40 +0100)]
Bump version to 2.1.1 (#6164)

8 years agoFallback default thumbnail in instance status API (#6177)
Yamagishi Kazutoshi [Thu, 4 Jan 2018 14:36:55 +0000 (23:36 +0900)]
Fallback default thumbnail in instance status API (#6177)

8 years agoi18n: Update Polish translation (#6176)
Marcin Mikołajczak [Thu, 4 Jan 2018 14:15:29 +0000 (15:15 +0100)]
i18n: Update Polish translation (#6176)

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