Eugen Rochko
7871d29aff
Skip pagination logic for pinned account timelines in reducer ( #7540 )
Fix #7516
6 years ago
MIYAGI Hikaru
0b1f88cfd5
Upgrade posix-spawn to master ( #7542 )
6 years ago
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
6 years ago
Thibaut Girka
9d6788b30b
Prevent click on video from opening detailed toot
6 years ago
Thibaut Girka
2154bd1b5a
Widen clickable area of toots
6 years ago
ThibG
625c4f36ef
Merge pull request #490 from glitch-soc/merge-upstream
Merge with tootsuite @ 57b503d4ef
6 years ago
David Yip
765fc6700c
ci: Hack around a Travis condition, I guess
6 years ago
Eugen Rochko
9422b3e0d8
Fix double-encoding of display name in title and e-mails ( #7534 )
6 years ago
David Yip
399af266e5
ci: Bump .travis.yml to 2.5.1
6 years ago
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
6 years ago
David Yip
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup
Remove service worker code that has never been used
6 years ago
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.
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
Eugen Rochko
57b503d4ef
Resolve unknown status from Add activity, skip Remove if unknown ( #7526 )
Fix #7518
6 years ago
Eugen Rochko
dafd7afc5e
Use randomized setTimeout when fallback-polling and re-add since_id ( #7522 )
6 years ago
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
6 years ago
Jenkins
4c0770d6c8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
MIYAGI Hikaru
919eef3098
User agent for WebFinger ( #7531 )
* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally...
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