Thibaut Girka
9ed8051961
Add preference to hide following/followers lists
...
Port SCSS from 1e02dc8715
2018-05-20 11:28:58 +02:00
Thibaut Girka
50540446f5
[Glitch] Improvements to toots display in admin view
...
Port SCSS changes from 0f2fbf7d05
2018-05-20 11:28:58 +02:00
David Yip
2f9bd86f6e
Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed
...
Widen clickable area of toots
2018-05-20 03:03:39 -05:00
Thibaut Girka
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
Yamagishi Kazutoshi
6aa5ea1b5d
Weblate translations (2018-05-20) ( #7552 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (Italian)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (French)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 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% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Italian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 83.7% (525 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (French)
Currently translated at 99.5% (624 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (French)
Currently translated at 99.6% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Galician)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (627 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (626 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (French)
Currently translated at 99.6% (626 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Swedish)
Currently translated at 99.5% (625 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Slovak)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Swedish)
Currently translated at 95.4% (63 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (627 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/
* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
2018-05-19 21:42:21 +02:00
Eugen Rochko
8378b72eba
Ensure push subscription is immediately removed when application is revoked ( #7548 )
...
* Ensure push subscription is immediately removed when application is revoked
* When token is revoked from app, unsubscribe too
2018-05-19 21:05:08 +02:00
Ash Furrow
50db106252
Disables autocorrect/autocapitalize on remote username field. ( #7549 )
2018-05-19 19:36:23 +02:00
Akihiko Odaki
4e1400cecb
Cache media only when storage can be freed ( #7547 )
2018-05-19 19:22:11 +02:00
Eugen Rochko
1bbe12254d
Improve direct message warning again ( #7546 )
2018-05-19 18:37:33 +02:00
Eugen Rochko
93c66f0c03
In footer, replace text "Mastodon" with logo ( #7545 )
2018-05-19 16:10:55 +02:00
takayamaki
587da93152
checking http status code with range ( #7544 )
2018-05-19 14:47:44 +02:00
Eugen Rochko
4b94e9c65e
Improve payload format of Web Push API now that it's open ( #7521 )
...
> Good lord what is happening in there
Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification ). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload:
```json
{
"access_token": "...",
"preferred_locale": "en",
"notification_id": "12345",
"notification_type": "follow",
"title": "So and so followed you",
"body": "This is my bio",
"icon": "https://example.com/avatar.png "
}
```
The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.
2018-05-19 14:46:47 +02:00
Akihiko Odaki
1951ff41b3
Do not override the default push notification settings ( #6037 )
2018-05-19 14:45:58 +02:00
bsky
138512d204
Remove outline ( #7543 )
2018-05-19 12:16:52 +02:00
Eugen Rochko
7871d29aff
Skip pagination logic for pinned account timelines in reducer ( #7540 )
...
Fix #7516
2018-05-19 02:51:29 +02:00
Eugen Rochko
97f02f2c08
Do not raise delivery failure on 4xx errors, increase stoplight threshold ( #7541 )
...
* Do not raise delivery failure on 4xx errors, increase stoplight threshold
Stoplight failure threshold from 3 to 10
Status code 429 will raise a failure/get retried
* Oops
2018-05-19 00:23:19 +02:00
Thibaut Girka
9d6788b30b
Prevent click on video from opening detailed toot
2018-05-18 17:49:51 +02:00
Thibaut Girka
2154bd1b5a
Widen clickable area of toots
2018-05-18 17:33:58 +02:00
ThibG
625c4f36ef
Merge pull request #490 from glitch-soc/merge-upstream
...
Merge with tootsuite @ 57b503d4ef
2018-05-18 17:20:32 +02:00
Eugen Rochko
9422b3e0d8
Fix double-encoding of display name in title and e-mails ( #7534 )
2018-05-18 15:56:57 +02:00
David Yip
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
David Yip
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup
...
Remove service worker code that has never been used
2018-05-18 08:37:31 -05:00
Akihiko Odaki
2beeea1e7d
Change Japanese translation for privacy.private.short ( #7535 )
...
The old translation means "hidden," but it is vague in terms that it does
not specify the scope status is hidden. The new translation is a literal
translation of "Followers-only," without such ambiguity.
2018-05-18 22:30:45 +09:00
David Yip
81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji
...
[Glitch] Enable custom emojis in profiles
2018-05-18 07:55:00 -05:00
David Yip
5d823ee00a
Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes
...
Port public UI changes from upstream
2018-05-18 07:53:53 -05:00
Eugen Rochko
57b503d4ef
Resolve unknown status from Add activity, skip Remove if unknown ( #7526 )
...
Fix #7518
2018-05-18 11:33:56 +02:00
Eugen Rochko
dafd7afc5e
Use randomized setTimeout when fallback-polling and re-add since_id ( #7522 )
2018-05-18 02:32:35 +02:00
Eugen Rochko
1e02dc8715
Add preference to hide following/followers lists ( #7532 )
...
* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix #6901
* Add preference
* Add delegation
* Fix issue
* Fix issue
2018-05-18 02:26:51 +02:00
Jenkins
4c0770d6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-18 00:17:23 +00:00
MIYAGI Hikaru
919eef3098
User agent for WebFinger ( #7531 )
...
* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally...
2018-05-18 01:47:22 +02:00
Thibaut Girka
07baa1ddb5
[Glitch] Open video modal on public UI
...
Port d9b2f84c92
2018-05-17 18:37:00 +02:00
Thibaut Girka
94db024e4c
[Glitch] Combine similar components into one on public UI
...
Port f9afd06221
2018-05-17 18:37:00 +02:00
Thibaut Girka
dd1d98f9cf
[Glitch] Show card modal on public pages
...
Port 16fee0335f
2018-05-17 18:37:00 +02:00
Thibaut Girka
52b2f18b15
[Glitch] Enable custom emojis in profiles
...
Port 61a9018607
2018-05-17 15:57:16 +02:00
Thibaut Girka
ca49ad86c6
Remove service worker code that has never been used
2018-05-17 15:39:37 +02:00
Jenkins
2636a23092
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-17 11:17:21 +00:00
Eugen Rochko
7293b9fc61
Ensure unfilled fields are shown when errors are shown ( #7523 )
...
Fix #7486
2018-05-17 13:00:56 +02:00
Eugen Rochko
dfb6907e08
HTTP signatures spec no longer requires algorithms field ( #7525 )
...
Fix #7520
2018-05-17 04:03:28 +02:00
Thibaut Girka
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
ThibG
80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu
...
[Glitch] Feature: Direct message from menu
2018-05-16 20:17:08 +02:00
ThibG
9712d59dda
Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color
...
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 20:16:59 +02:00
Thibaut Girka
784712791d
[Glitch] Reword the direct message warning
...
Port 53c2164e9c
2018-05-16 19:45:30 +02:00
Thibaut Girka
97c69de416
[Glitch] Feature: Direct message from Statuses
...
Port 904a2479dd
2018-05-16 19:45:30 +02:00
Thibaut Girka
fb6de5310d
[Glitch] Fix issues with sending direct messages from user profile
...
Port 4fd71accd4
2018-05-16 19:45:30 +02:00
Thibaut Girka
a5fac975f3
[Glitch] Feature: Direct message from menu
...
Port d1f34151ae
2018-05-16 19:45:30 +02:00
Thibaut Girka
eb9c9855ce
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 19:37:44 +02:00
Evgeny Petrov
5e87c79d25
Russian language for 2.4.0 ( #7512 )
...
* Russian language for 2.4.0
* Russian language for 2.4.0
* bundle exec i18n-tasks normalize
* RU: Updated some strings after new commits appeared
2018-05-16 16:25:11 +02:00
Eugen Rochko
2b97451168
Fix images resized in browser getting cropped ( #7514 )
...
Fix #7487
2018-05-16 16:24:16 +02:00
Technowix
4ea376121a
French translation tweaks ( #7513 )
...
- Use more neutral terminology for readability.
- Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product".
- Some fixes for accounts.
2018-05-16 23:21:48 +09:00
Quentí
f60c1d3989
[l10n] Occitan update ( #7505 )
...
* Update oc.json
* Update doorkeeper.oc.yml
* Update oc.yml
* Update simple_form.oc.yml
* Update oc.json
Accept is the opp. of reject, I think it's better like this.
* bundle exec i18n-tasks normalize
2018-05-16 23:18:32 +09:00
