Thibaut Girka
b9d5d8982d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
f328d20ff8
Increase timeout for assets:precompile
6 years ago
Thibaut Girka
d2244c86de
Goodbye Travis CI, hello Circle CI? ( fixes #559 )
6 years ago
Thibaut Girka
552b4d9a5f
Disable threaded mode when canceling a reply ( fixes #583 )
6 years ago
ThibG
c44579c42d
Merge pull request #585 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Yamagishi Kazutoshi
7e638043b9
Weblate translations (2018-07-18) ( #8047 )
...
* Translated using Weblate (Italian)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Danish)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Slovak)
Currently translated at 97.2% (625 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Czech)
Currently translated at 5.1% (5 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Italian)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 83.5% (537 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/
* Translated using Weblate (Esperanto)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Galician)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Japanese)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Persian)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Japanese)
Currently translated at 98.7% (654 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (656 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.2% (657 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Danish)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Danish)
Currently translated at 77.9% (516 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Danish)
Currently translated at 74.1% (46 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/
* Translated using Weblate (Slovak)
Currently translated at 95.6% (633 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Japanese)
Currently translated at 99.3% (658 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 96.2% (637 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Occitan)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Occitan)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* yarn manage:translations && i18n-tasks normalize
* revert db/schema.rb
6 years ago
Thibaut Girka
7dbed4dab9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
1fb78602c5
Do not cause an error if domain_lists.blocks.next is undefined ( fixes #572 )
...
Port d0d23b8f0a
to glitch-soc
6 years ago
Thibaut Girka
8501ad5c5c
Process statuses on COMPOSE_SUBMIT_SUCCESS ( fixes #579 )
6 years ago
ThibG
012ca4c68d
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
6277a6db2a
Hide "A look inside" in mobile layout on frontpage ( #8044 )
6 years ago
Eugen Rochko
f6910fba02
Ensure container of React components has full width ( #8043 )
...
Fix #8018
6 years ago
abcang
3c3cf7e208
Update supported Node.js version ( #8041 )
6 years ago
Eugen Rochko
2bcdfcdee3
Add missing translation for admin dashboard trends section ( #8040 )
6 years ago
Eugen Rochko
69c34f3438
Fix number of results returned from TrendingTags.get
6 years ago
Eugen Rochko
8241f162df
Fix tag usage display on admin dashboard
6 years ago
Eugen Rochko
0d13e30ad2
Display trending hashtags on admin dashboard ( #8038 )
6 years ago
Eugen Rochko
7e2678f7f6
Fix ActivityPub::UpdateDistributionWorker regression ( #8039 )
...
Regression from #7998 let to profile updates not sending
6 years ago
Eugen Rochko
a23ac107e4
Fix activity:interactions counter to count all interactions ( #8037 )
6 years ago
Thibaut Girka
bcf157a1a9
Avoid loading rails-ujs twice on vanilla flavour
6 years ago
Eugen Rochko
8f64b17d98
Whitelist dat/ipfs/gopher links in sanitizer ( #8034 )
...
Fix #7994
6 years ago
Thibaut Girka
f26f1145ac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
6 years ago
Marcin Mikołajczak
daacf15d72
i18n: Update Polish translation ( #8032 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
Eugen Rochko
04587116bd
Fix typo in Admin::DashboardController#index
7 years ago
Eugen Rochko
2354b10eb5
Add admin dashboard ( #8029 )
7 years ago
Akihiko Odaki
7a68608237
Fix index detection a migration to revert index change ( #8026 )
7 years ago
THE BOSS ♨
dc62195a06
Upgrade Node.js to v8.x on nvmrc ( #8023 )
7 years ago
Kevin Liu
68cccb00ef
Dockerfile: run asset precompilation as a build step ( #7780 )
...
* Dockerfile: run asset precompilation as a build step
* Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
7 years ago
ThibG
955d5d36e8
Use LoadingBar instead of blur to indicate that an image is loading ( fixes #4060 ) ( #7562 )
7 years ago
Yamagishi Kazutoshi
af161e849d
Downgrade react-swipeable-views to v0.12.13 from v0.12.14 ( #8022 )
7 years ago
ThibG
d0d23b8f0a
Do not cause an error if domain_lists.blocks.next is undefined ( #8021 )
...
A valid URL is always truthy, so we can simplify this check
7 years ago
Yamagishi Kazutoshi
0eacf2b419
Upgrade Node.js to v8.x on Docker image ( #8019 )
7 years ago
Jeong Arm
0f0576ea06
Add missing Korean translations ( #8017 )
7 years ago
Eugen Rochko
2a176514be
Display full acct on public status pages, always ( #8011 )
7 years ago
Eugen Rochko
38e9662d78
Disable language detection for texts shorter than 140 characters ( #8010 )
...
If the input text is blank after preparation (only mention, or
only URL, or empty as in a media post), then use nil as language,
since it's OK to show to everyone.
Otherwise, always fall back to the server's default locale
7 years ago
Eugen Rochko
0180037dfb
Fix streaming API still using filtered instead of chosen languages ( #8009 )
7 years ago
Eugen Rochko
5a6645c922
Fix static GIFs being saved as empty files when using local storage ( #8012 )
...
Fix #7997
Fix #6237
7 years ago
Yamagishi Kazutoshi
e9b322d0a6
Upgrade webpack to version v4.x ( #6655 )
7 years ago
Eugen Rochko
e709107463
Display Mastodon version in footer of web UI ( #8013 )
...
Fix #7846
7 years ago
Eugen Rochko
9b75dee316
Weblate translations (2018-07-14) ( #8016 )
...
* Translated using Weblate (Slovak)
Currently translated at 97.7% (622 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (636 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (635 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (73 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (German)
Currently translated at 100.0% (78 of 78 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
Eine Option ist "nie", also muss es das Ablaufdatum sein, nicht das Datum bis wann es gültig ist
* Translated using Weblate (Japanese)
Currently translated at 99.6% (305 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 100.0% (80 of 80 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Slovak)
Currently translated at 98.7% (79 of 80 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.7% (622 of 636 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Danish)
Currently translated at 100.0% (80 of 80 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Galician)
Currently translated at 100.0% (643 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (77 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.2% (638 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.3% (639 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Danish)
Currently translated at 77.2% (497 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (643 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.0% (624 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Czech)
Currently translated at 5.2% (34 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* i18n-tasks normalize && yarn manage:translations
7 years ago
Eugen Rochko
47c59591e0
Do not count self in potential friendships ( #8014 )
7 years ago
Jeong Arm
c8c25ea7eb
Add dependencies for uWebSockets ( #7466 )
...
UWS needs openssl and zlib https://github.com/uNetworking/uWebSockets/wiki/Misc.-details#dependencies
7 years ago
Petko Bordjukov
37d428dfaf
Update uws dependency to 10.148.0 ( #7448 )
...
This release fixes issues with open events, adds Node 10 support
and drops Node 4, 5, 6 and 7.
Changes: 6152fb6787...689c15c59e
7 years ago
Eugen Rochko
e55dce3176
Add federation relay support ( #7998 )
...
* Add federation relay support
* Add admin UI for managing relays
* Include actor on relay-related activities
* Fix i18n
7 years ago
ThibG
8e8491e1da
Merge pull request #575 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
Thibaut Girka
ddfcedcfe4
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Thibaut Girka
57f31b361f
Add an option restricting secondary toot privacy to that of the toot being replied to
7 years ago
mayaeh
401559c376
Fix whole-word selection and i18n: Add Japanese translation for Whole-word ( #8004 )
...
* Add Japanese translation for "Whole word" and add it's description.
* Fix to enable "Whole-word" selection.
7 years ago
Thibaut Girka
d8b13b46f7
Move privacyPreference to utils
7 years ago
Thibaut Girka
cd05378b59
[Glitch] Refactor privacyPrefence() to use priority list
...
Port f2d9a3c239
to glitch-soc
7 years ago