a263178cf3
Improve scss refactor 4
2018-01-14 09:12:10 +09:00
25f7568a7e
Improve scss refactor 3
2018-01-14 08:47:59 +09:00
090d7c1807
Improve scss refactor 2
2018-01-14 07:48:18 +09:00
4d9133003f
Improve scss refactor 1
2018-01-14 07:18:50 +09:00
75af54925a
Fix padded-blocks error
2018-01-14 04:12:41 +09:00
9e7150c6fa
Initial scss refactor
2018-01-14 03:41:20 +09:00
a9bfc5b3c5
Merge pull request #324 from glitch-soc/load-public-on-admin
...
Load public javascripts on admin pages
2018-01-12 23:52:41 -05:00
64f483cc0f
load public.js on vanilla#admin
2018-01-12 18:52:53 -08:00
056f52edac
Load packs/public.js for glitch#admin
2018-01-12 18:51:52 -08:00
430f9c37ea
Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'
2018-01-12 20:10:58 -06:00
7837d2c49f
Merge pull request #322 from m4sk1n/glitch-soc-pl
...
i18n: Update Polish translation
2018-01-12 18:16:31 -05:00
6be6f6f5bd
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-12 23:08:51 +01:00
895a578030
Merge pull request #321 from KnzkDev/fix/dropdown-text
...
Fix dropdown item text
2018-01-12 09:09:10 -06:00
327c9e96e0
Fix dropdown text
2018-01-12 23:18:25 +09:00
e6049e6fd0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-12 02:17:15 +00:00
73b6f2ebe9
Handle sessions that can't be translated ( #6245 )
...
* Handle sessions that can't be translated
This commit fixes #6165 .
* Fix typo
2018-01-12 02:44:28 +01:00
5ed533dffd
Merge pull request #320 from glitch-soc/dockerfile-stack-space
...
dockerfile: Give more stack space to /sbin/tini
2018-01-11 04:25:26 -06:00
b6d0dcc5d3
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 .
2018-01-11 04:09:16 -06:00
31aad49ad6
Merge pull request #319 from glitch-soc/317-attempt-to-switch-flavors-raises-actioncontroller-parametermissing
...
Fix #317 : Attempting to switch flavors raises ActionController::ParameterMissing
2018-01-10 12:49:43 -06:00
53854707ce
Thank you, Officer Murphy
2018-01-10 12:10:43 -06:00
ec1199404c
The flavour parameter is unused, so omit it ( #317 )
2018-01-10 12:09:42 -06:00
28e652d35d
Allow for user object to be empty. Fixes #317 .
...
If a flavour has only one skin, the skin selector will be omitted. This
omits the user[setting_skin] field, and because that's the only
user[...] field on the page, the entire user object will not be present
in the request handler's params object.
This commit accounts for that scenario by avoiding params.require(:user)
and instead picking out what we need from the params hash.
2018-01-10 12:09:42 -06:00
eecdc3e6a7
Add examples based on errors seen in #317
2018-01-10 12:09:41 -06:00
dbf88612e3
Merge pull request #316 from glitch-soc/fix-async
...
Fix glitch async chunks
2018-01-09 18:30:45 -06:00
c4d63ba442
Renamed glitch async chunks
2018-01-09 16:26:14 -08:00
7852fc7706
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
...
Merge vanilla updates into glitch - round 2
2018-01-09 17:01:23 -06:00
1a7f8eb723
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
2018-01-09 14:16:45 -06:00
e19ece354e
Skip ActivityPub Announces of non-public objects ( #6230 )
...
* Skip ActivityPub Announces of non-public objects
* Skip OStatus reblogs of non-public statuses
2018-01-09 19:35:10 +01:00
6d9f2924ad
Fix #6204 : Use content warning for page title when present ( #6231 )
2018-01-09 19:34:58 +01:00
12469bed1b
Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )
2018-01-09 10:51:14 -06:00
6b20cd7c10
Fix overflowing audit logs (tootsuite pr #6184 )
2018-01-09 10:40:14 -06:00
d1ddba043a
Set background to the navigation of Getting Started column (tootsuite pr #6163 )
2018-01-09 10:37:27 -06:00
3ba78c7bda
Use const instead of let for constant (tootsuite pr #6106 )
2018-01-09 10:35:36 -06:00
b7b0f630a0
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.
2018-01-09 17:07:54 +01:00
90c35fe17a
change key to path in timeline settings containers
2018-01-09 09:58:40 -06:00
cf027c74db
Rename key to path in actions and reducers for settings (tootsuite pr #6105 )
2018-01-09 09:48:14 -06:00
d12ce24054
Fix newlines-to-spaces functionality (tootsuite pr #6158 )
2018-01-09 08:52:14 -06:00
0d399a4edc
Hide moved account's follow button in search result (tootsuite pr #5913 )
2018-01-09 08:50:55 -06:00
783f65dd72
Prevent duplicate load of favourites (tootsuite pr #5931 )
2018-01-09 08:46:35 -06:00
9fb57f8583
add index on statuses for /api/v1/accounts/:account_id/statuses ( #6202 )
2018-01-09 15:00:19 +01:00
223be1e1b2
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
2018-01-09 14:59:19 +01:00
a6ef3cde8e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 12:17:16 +00:00
164ec8297f
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
2018-01-09 20:30:28 +09:00
1dd6482fb5
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-01-08 23:20:39 -06:00
52d99f96bd
Merge pull request #312 from glitch-soc/tag-sensitive-imgs
...
Show SENSITIVE tag on sensitive images (#267 )
2018-01-08 23:19:14 -06:00
b02479fbb1
Merge pull request #311 from glitch-soc/dont-show-solo-skins
...
Don't show skins selector when there's only one (#256 )
2018-01-08 23:18:30 -06:00
f9a0b246e5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-09 05:17:13 +00:00
97a5eb7961
Merge pull request #310 from glitch-soc/fix-thread-inheritance
...
Threads now inherit privacy directly (#309 )
2018-01-08 23:15:58 -06:00
ff6ecdda4e
Add missing comma
2018-01-08 18:38:28 -08:00
95459fc5bd
Show SENSITIVE tag on sensitive images ( #267 )
2018-01-08 18:25:29 -08:00
ncls7615