02326a4322
[Glitch] Use LoadingBar instead of blur to indicate that an image is loading
...
Port 955d5d36e8
2018-07-24 21:20:18 +02:00
1769a7e9aa
Use the same description string as upstream for the “x” hotkey
2018-07-24 21:15:21 +02:00
b1ed2b1d03
Fix focusing search bar with hotkeys
2018-07-24 21:15:21 +02:00
c600bcfe1d
Fix focusing composer textarea on “new toot” hotkey
2018-07-24 21:15:21 +02:00
037228cf03
Fix routing issues, especially keyboards shortcuts changing location
2018-07-24 21:14:50 +02:00
1aa253c41d
Display custom emoji in account notes in WebUI ( fixes #595 )
2018-07-21 21:44:49 +02:00
c99054ecb2
Add CSS for the newly-introduced dashboard ( fixes #592 )
2018-07-18 23:08:27 +02:00
828f602b2f
[Glitch] Ensure container of React components has full width
...
Port f6910fba02
2018-07-18 22:38:55 +02:00
baf42ef0b3
Merge pull request #590 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-18 22:38:43 +02:00
b9d5d8982d
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-18 21:54:51 +02:00
f328d20ff8
Increase timeout for assets:precompile
2018-07-18 21:20:30 +02:00
d2244c86de
Goodbye Travis CI, hello Circle CI? ( fixes #559 )
2018-07-18 21:20:30 +02:00
552b4d9a5f
Disable threaded mode when canceling a reply ( fixes #583 )
2018-07-18 16:42:00 +02:00
c44579c42d
Merge pull request #585 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-18 09:17:20 +02:00
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
2018-07-18 15:38:35 +09:00
7dbed4dab9
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-17 22:05:25 +02:00
1fb78602c5
Do not cause an error if domain_lists.blocks.next is undefined ( fixes #572 )
...
Port d0d23b8f0a
2018-07-17 21:54:54 +02:00
8501ad5c5c
Process statuses on COMPOSE_SUBMIT_SUCCESS ( fixes #579 )
2018-07-17 21:54:36 +02:00
012ca4c68d
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-07-17 21:54:12 +02:00
6277a6db2a
Hide "A look inside" in mobile layout on frontpage ( #8044 )
2018-07-17 21:44:11 +02:00
f6910fba02
Ensure container of React components has full width ( #8043 )
...
Fix #8018
2018-07-17 18:54:07 +02:00
3c3cf7e208
Update supported Node.js version ( #8041 )
2018-07-17 15:29:33 +02:00
2bcdfcdee3
Add missing translation for admin dashboard trends section ( #8040 )
2018-07-17 07:15:17 +09:00
69c34f3438
Fix number of results returned from TrendingTags.get
2018-07-16 19:54:14 +02:00
8241f162df
Fix tag usage display on admin dashboard
2018-07-16 19:51:16 +02:00
0d13e30ad2
Display trending hashtags on admin dashboard ( #8038 )
2018-07-16 19:21:27 +02:00
7e2678f7f6
Fix ActivityPub::UpdateDistributionWorker regression ( #8039 )
...
Regression from #7998 let to profile updates not sending
2018-07-16 18:43:22 +02:00
a23ac107e4
Fix activity:interactions counter to count all interactions ( #8037 )
2018-07-16 18:35:43 +02:00
bcf157a1a9
Avoid loading rails-ujs twice on vanilla flavour
2018-07-16 16:42:52 +02:00
8f64b17d98
Whitelist dat/ipfs/gopher links in sanitizer ( #8034 )
...
Fix #7994
2018-07-16 22:17:43 +09:00
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
2018-07-16 14:50:42 +02:00
daacf15d72
i18n: Update Polish translation ( #8032 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-07-16 19:23:27 +09:00
04587116bd
Fix typo in Admin::DashboardController#index
2018-07-16 01:58:10 +02:00
2354b10eb5
Add admin dashboard ( #8029 )
2018-07-16 01:11:53 +02:00
7a68608237
Fix index detection a migration to revert index change ( #8026 )
2018-07-15 14:56:00 +02:00
dc62195a06
Upgrade Node.js to v8.x on nvmrc ( #8023 )
2018-07-15 12:29:17 +09:00
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
2018-07-15 01:19:09 +02:00
955d5d36e8
Use LoadingBar instead of blur to indicate that an image is loading ( fixes #4060 ) ( #7562 )
2018-07-15 01:18:09 +02:00
af161e849d
Downgrade react-swipeable-views to v0.12.13 from v0.12.14 ( #8022 )
2018-07-15 01:01:01 +02:00
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
2018-07-14 23:28:29 +02:00
0eacf2b419
Upgrade Node.js to v8.x on Docker image ( #8019 )
2018-07-14 15:12:27 +02:00
0f0576ea06
Add missing Korean translations ( #8017 )
2018-07-14 18:27:27 +09:00
2a176514be
Display full acct on public status pages, always ( #8011 )
2018-07-14 04:07:47 +02:00
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
2018-07-14 04:05:36 +02:00
0180037dfb
Fix streaming API still using filtered instead of chosen languages ( #8009 )
2018-07-14 03:59:31 +02:00
5a6645c922
Fix static GIFs being saved as empty files when using local storage ( #8012 )
...
Fix #7997
Fix #6237
2018-07-14 03:56:52 +02:00
e9b322d0a6
Upgrade webpack to version v4.x ( #6655 )
2018-07-14 03:56:41 +02:00
e709107463
Display Mastodon version in footer of web UI ( #8013 )
...
Fix #7846
2018-07-14 03:56:34 +02:00
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
2018-07-14 10:54:11 +09:00
47c59591e0
Do not count self in potential friendships ( #8014 )
2018-07-14 10:44:23 +09:00
Thibaut Girka
Yamagishi Kazutoshi
Eugen Rochko
abcang
Marcin Mikołajczak
Akihiko Odaki
THE BOSS ♨
Kevin Liu
Jeong Arm