David Yip
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup
Remove service worker code that has never been used
6 years ago
David Yip
81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji
[Glitch] Enable custom emojis in profiles
6 years ago
David Yip
5d823ee00a
Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes
Port public UI changes from upstream
6 years ago
Thibaut Girka
07baa1ddb5
[Glitch] Open video modal on public UI
Port d9b2f84c92
to glitch-soc
6 years ago
Thibaut Girka
94db024e4c
[Glitch] Combine similar components into one on public UI
Port f9afd06221
to glitch-soc
6 years ago
Thibaut Girka
dd1d98f9cf
[Glitch] Show card modal on public pages
Port 16fee0335f
to glitch-soc
6 years ago
Thibaut Girka
52b2f18b15
[Glitch] Enable custom emojis in profiles
Port 61a9018607
to glitch-soc
6 years ago
Thibaut Girka
ca49ad86c6
Remove service worker code that has never been used
6 years ago
Jenkins
2636a23092
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko
7293b9fc61
Ensure unfilled fields are shown when errors are shown ( #7523 )
Fix #7486
6 years ago
Shuhei Kitagawa
b48a166c82
Add tests for account_moderation_notes_controller ( #7524 )
6 years ago
Eugen Rochko
dfb6907e08
HTTP signatures spec no longer requires algorithms field ( #7525 )
Fix #7520
6 years ago
ThibG
4bf43e6f3e
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
Merge changes from upstream
6 years ago
Thibaut Girka
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
6 years ago
ThibG
80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu
[Glitch] Feature: Direct message from menu
6 years ago
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
6 years ago
Thibaut Girka
784712791d
[Glitch] Reword the direct message warning
Port 53c2164e9c
to glitch-soc
6 years ago
Thibaut Girka
97c69de416
[Glitch] Feature: Direct message from Statuses
Port 904a2479dd
to glitch-soc
6 years ago
Thibaut Girka
fb6de5310d
[Glitch] Fix issues with sending direct messages from user profile
Port 4fd71accd4
to glitch-soc
6 years ago
Thibaut Girka
a5fac975f3
[Glitch] Feature: Direct message from menu
Port d1f34151ae
to glitch-soc
6 years ago
Thibaut Girka
eb9c9855ce
Fix mastodon-light background color of the composer textarea when posting
6 years ago
MIYAGI Hikaru
6bed372ad2
Fix posix-spawn to version 0.3.12 ( #7517 )
Because 0.3.13 causes build error in x86 or other ILP32 environments.
closes #7453
6 years ago
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
6 years ago
Eugen Rochko
2b97451168
Fix images resized in browser getting cropped ( #7514 )
Fix #7487
6 years ago
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.
6 years ago
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
6 years ago
nightpool
dbf65e1b76
Update bot preference text ( #7507 )
* Update simple_form.en.yml
* fix #2
6 years ago
Sylvhem
53c2164e9c
Reword the direct message warning ( #7420 )
* Change direct message warning
Reword the direct message warning to set proper privacy expectations.
* Update the French translation
Update the French translation to reflect the changes made to the direct message warning.
* Wording update
Update the message's wording according to the feedback.
6 years ago
Akihiko Odaki
77cd6b5096
Do not use permitted_for scope when querying pinned statuses ( #7510 )
permitted_for scope is slow when combined with pinned status scope.
Fortunately permitted_for scope can safely be removed because a pinned
status is always public.
6 years ago
Akihiko Odaki
55fd55714a
Raise Mastodon::RaceConditionError if Redis lock failed ( #7511 )
An explicit error allows user agents to know the error and Sidekiq to
retry.
6 years ago
Akihiko Odaki
65d6b253fb
Let navigator follow redirect instead that handling redirect in fetch ( #7500 )
* Let navigator follow redirect instead that handling redirect in fetch
* Do not use cache when fetched resource is to redirect
6 years ago
Akihiko Odaki
17c1a62ec8
Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser ( #7506 )
6 years ago
Akihiko Odaki
4511a10e66
Test if navigator.storage.estimate exists before using it ( #7504 )
6 years ago
Akihiko Odaki
918cfd3be6
Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 ( #7503 )
6 years ago
Marcin Mikołajczak
ff84c18e3d
🌍 : 🇵🇱 ⬆️ ( #7494 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
unarist
d47091eb97
Fix custom emoji handling in UpdateRemoteProfileService (OStatus) ( #7501 )
This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.
6 years ago
Renato "Lond" Cerqueira
1f74c1dbcb
Weblate translations 20180515 ( #7496 )
* Translated using Weblate (Catalan)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/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 (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 (Slovak)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Korean)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* 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 (Dutch)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* 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 (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 (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovak)
Currently translated at 95.3% (597 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* 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 (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 (Korean)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Korean)
Currently translated at 99.8% (625 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Added translation using Weblate (Slovenian)
* Added translation using Weblate (Slovenian)
* Added translation using Weblate (Slovenian)
* Added translation using Weblate (Slovenian)
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.3% (623 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 98.4% (63 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Arabic)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 99.6% (294 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Italian)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* 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 (Galician)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* 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 (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 (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 7.8% (5 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 12.5% (8 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/
* 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 (Slovenian)
Currently translated at 11.9% (75 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 14.1% (89 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (624 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* 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 (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 (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 (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 (Japanese)
Currently translated at 99.6% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
* Remove translations causing issues in arabic
Related to #6673
6 years ago
Akihiko Odaki
3705cd8322
Clone response before using when caching web page ( #7498 )
6 years ago
ThibG
f47f6c3345
Merge pull request #483 from ThibG/glitch-soc/fixes/modal
Fix modals testing for props.noEsc (fixes #482 )
6 years ago
Thibaut Girka
dfa60cb0a8
Fix modals testing for props.noEsc ( fixes #482 )
6 years ago
Wiktor
7fe2993b87
Fix account URI when updating ActivityPub account ( #7488 )
Updates account `uri` field on each call to `update_account` instead of
only once during `create_account` to mirror the same behavior in OStatus
`ResolveAccountService` class [0].
ActivityPub accounts are identified using `@username` and `@domain` pair
instead of URI since #6842 .
This fixes #7479 : a bug when the account identified by `@username` and
`@domain` changes its URI.
[0]:
03b69ebc45/app/services/resolve_account_service.rb (L121)
6 years ago
David Yip
939ea456d2
Merge pull request #476 from ThibG/fixes/update-scss
Change local settings SCSS to be more consistent with modals
6 years ago
Thibaut Girka
971218d1dc
Change local settings SCSS to be more consistent with modals
6 years ago
David Yip
b5684e9874
Merge pull request #481 from ThibG/glitch-soc/merge
Merge upstream changes
6 years ago
Thibaut Girka
ba7ee67498
Merge branch 'master' into glitch-soc/merge
6 years ago
Akihiko Odaki
03b69ebc45
Disallow async function in service worker ( #7482 )
offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an
alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6
uses uglify-js 2.8.29, which is not compatible with async function.
6 years ago
Akihiko Odaki
ed4bae182b
Revert index change on statuses for api/v1/accounts account_id statuses ( #7484 )
6 years ago
Eugen Rochko
8756fd1e82
Bump version to 2.4.0rc3
6 years ago
Akihiko Odaki
d8b3f5fb9a
Limit environment variables to expose to webpack ( #7480 )
6 years ago
Eugen Rochko
d75b63e4fb
Bump version to 2.4.0rc2
6 years ago