Thibaut Girka
02876fd33c
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
...
Port a661a25845
to glitch-soc
7 years ago
Jenkins
3fc6e7dabb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
93b8db8f08
Better pagination for ActivityPub outbox ( #7356 )
7 years ago
David Yip
ecdfcbf266
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
CONTRIBUTING.md
7 years ago
David Yip
ec2dc881dd
Merge branch 'merge-upstream' into gs-master
7 years ago
David Yip
ccb6a8e2d2
Merge pull request #456 from m4sk1n/glitch-contrast
...
“Enable” high contrast theme
7 years ago
Marcin Mikołajczak
e38c51da92
Improve “how to translate” ( #7358 )
7 years ago
Yamagishi Kazutoshi
00df2b623f
Add translate guide to CONTRIBUTING.md ( #7355 )
7 years ago
Marcin Mikołajczak
17fa2c7aa6
“Enable” high contrast theme
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
David Yip
c03d5b2c52
Remove duplicate posix-spawn entry from Gemfile.
7 years ago
David Yip
8ce630ee2e
Make posix-spawn spec in Gemfile match what's in Gemfile.lock.
7 years ago
David Yip
ea46024add
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
7 years ago
Eugen Rochko
d9eda62221
Show remote reports in admin UI as coming from domain rather than user ( #7347 )
...
Fix #6994
7 years ago
Eugen Rochko
860701a9a8
Marginally improve convert/ffmpeg calls performance with posix-spawn ( #7346 )
7 years ago
David Yip
b0dcceb9fe
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip
976347fa78
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip
74be9b2f65
Merge pull request #453 from ThibG/glitch-soc/features/short-date
...
[Glitch] Improve relative timestamps in web UI
7 years ago
David Yip
587c2da0cf
Remove unused translations.
7 years ago
David Yip
dde7fa8bbe
Remove unnecessary code from MediaAttachment#set_type_and_extension.
...
Well, it seems unnecessary, anyway.
7 years ago
Shuhei Kitagawa
4a422a7eaa
Fix 2fa description in Japanese ( #7349 )
7 years ago
David Yip
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
7 years ago
ThibG
f2ecedaab5
Fixes/do not override timestamps ( #7336 )
...
* Revert "Fixes/do not override timestamps (#7331 )"
This reverts commit 9c1e1005f4
.
* Document Snowflake ID corner-case a bit more
Snowflake IDs are used for two purposes: making object identifiers harder to
guess and ensuring they are in chronological order. For this reason, they
are based on the `created_at` attribute of the object.
Unfortunately, inserting items with older snowflakes IDs will break the
assumption of consumers of the paging APIs that new items will always have
a greater identifier than the last seen one.
* Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at
7 years ago
ThibG
554653a423
Do not re-position scroll when loading more (inserting items from below) ( #7344 )
7 years ago
Akihiko Odaki
854d974499
Add a missing question mark in rack_attack.rb ( #7338 )
7 years ago
Akihiko Odaki
5cddff0795
Throttle media post ( #7337 )
...
The previous rate limit allowed to post media so fast that it is possible
to fill up the disk space even before an administrator notices. The new
rate limit is configured so that it takes 24 hours to eat 10 gigabytes:
10 * 1024 / 8 / (24 * 60 / 30) = 27 (which rounded to 30)
The period is set long so that it does not prevent from attaching several
media to one post, which would happen in a short period. For example,
if the period is 5 minutes, the rate limit would be:
10 * 1024 / 8 / (24 * 60 / 5) = 4
This long period allows to lift the limit up.
7 years ago
Yamagishi Kazutoshi
5bd8cda844
Add el and te ( #7332 )
...
* Add el and te
* Add missing locale files
7 years ago
Yamagishi Kazutoshi
fa90629c9f
Delete dump.rdb ( #7334 )
7 years ago
ThibG
9c1e1005f4
Fixes/do not override timestamps ( #7331 )
...
* Do not override timestamps for incoming toots
* Remove every reference to override_timestamps
Statuses are now created with the announced publishing date
and are only pushed to timelines if that date is at most
6 hours earlier than the time at which it is processed.
7 years ago
Eugen Rochko
9bd3723f06
Revert "Do not override timestamps for incoming toots" ( #7330 )
...
* Revert "Weblate translations 20180503 (#7325 )"
This reverts commit b84b11c41a
.
* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278 ) (#7327 )"
This reverts commit 9188537f5f
.
* Revert "Add pry-byebug (#7307 )"
This reverts commit 7236e9effe
.
* Revert "Do not override timestamps for incoming toots (#7326 )"
This reverts commit b6f4e83c93
.
7 years ago
Renato "Lond" Cerqueira
b84b11c41a
Weblate translations 20180503 ( #7325 )
...
* Translated using Weblate (German)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Slovak)
Currently translated at 92.3% (578 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Added translation using Weblate (Greek)
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (75 of 75 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 93.5% (58 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.6% (624 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Added translation using Weblate (Greek)
* Added translation using Weblate (Malay)
* Translated using Weblate (Greek)
Currently translated at 0.6% (2 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 1.3% (4 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 2.0% (6 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 2.3% (7 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 2.7% (8 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 3.0% (9 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 4.3% (27 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 4.7% (30 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 4.7% (30 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 5.1% (32 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 5.2% (33 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Swedish)
Currently translated at 95.1% (59 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.3% (622 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 23.8% (70 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (626 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 94.0% (589 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Added translation using Weblate (Telugu)
* Translated using Weblate (German)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 98.3% (61 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Telugu)
Currently translated at 0.3% (2 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/
* Translated using Weblate (German)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 98.3% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/
* Translated using Weblate (German)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/
* Translated using Weblate (German)
Currently translated at 99.5% (623 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Spanish)
Currently translated at 93.2% (584 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 93.2% (584 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 93.2% (584 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 93.2% (584 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 99.8% (625 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Slovak)
Currently translated at 95.0% (595 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Greek)
Currently translated at 24.1% (71 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 24.1% (71 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (French)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.6% (624 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Italian)
Currently translated at 54.6% (342 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Italian)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* 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 99.8% (625 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (German)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 99.6% (624 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Galician)
Currently translated at 100.0% (626 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (294 of 294 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Swedish)
Currently translated at 99.5% (623 of 626 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
* Add back file removed by weblate
7 years ago
ThibG
9188537f5f
Prevent timeline from moving when cursor is hovering over it ( fixes #7278 ) ( #7327 )
7 years ago
Shuhei Kitagawa
7236e9effe
Add pry-byebug ( #7307 )
7 years ago
ThibG
b6f4e83c93
Do not override timestamps for incoming toots ( #7326 )
7 years ago
Shuhei Kitagawa
995d9e8485
Add missing tests for report.rb ( #7324 )
7 years ago
ThibG
a661a25845
Place emoji picker top if it is closer to the bottom of the viewport ( fixes #7277 ) ( #7314 )
7 years ago
Eugen Rochko
92c5474861
Fix n+1 queries in StatusThreadingConcern ( #7321 )
7 years ago
Eugen Rochko
5dd68ba919
Fix cache_associated no longer working ( #7320 )
7 years ago
Eugen Rochko
68ba4f23e0
Serialize webfinger XML with Ox instead of Nokogiri ( #7319 )
...
25ms -> 0.5ms
7 years ago
Eugen Rochko
ba4e838b7f
Improve PostStatusService performance ( #7317 )
...
Offload creation of local notifications to a worker. Remove two
redundant SQL queries from ProcessMentionsService, remove n+1
XML/JSON serialization via memoization
7 years ago
Eugen Rochko
ca1c696dbd
Slightly reduce RAM usage ( #7301 )
...
* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts
7 years ago
abcang
fcfc44de66
Keep notification when muting_notifications is true ( #7311 )
...
* Keep notification when muting_notifications is true
* Retrun mute object
* Fix test
7 years ago
ThibG
616cfab97c
Accept actor object updates from all supported actor types ( #7312 )
7 years ago
Eugen Rochko
4258e304c5
Allow updating bio fields via PUT /api/v1/accounts/update_credentials ( #7288 )
...
Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials
7 years ago
Eugen Rochko
c5fa8041c2
Remove most behaviour disparities between blocks and mutes ( #7231 )
...
* Remove most behaviour disparities between blocks and mutes
The only differences between block and mute should be:
- Mutes can optionally NOT affect notifications
- Mutes should not be visible to the muted
Fix #7230
Fix #5713
* Do not allow boosting someone you blocked
Fix #7248
* Do not allow favouriting someone you blocked
* Fix nil error in StatusPolicy
7 years ago
Eugen Rochko
d6a2530d73
Speed up test suite by not generating RSA keys in test environment ( #7296 )
...
One RSA keypair for all fabricated test accounts is enough
7 years ago
Eugen Rochko
192746ec3e
Guard against nil URLs in Request class ( #7284 )
...
Fix #7265
7 years ago
Shuhei Kitagawa
a110cce92b
Add missing tests for user.rb ( #7306 )
7 years ago
Thibaut Girka
41fe73f35c
[Glitch] Improve relative timestamps in web UI
...
Port 07e5dcb65f
to glitch-soc flavour
7 years ago
Surinna Curtis
72793b3fc7
Support Actors/Statuses with multiple types ( #7305 )
...
* Add equals_or_includes_any? helper in JsonLdHelper
* Support arrays in JSON-LD type fields for actors/tags/objects.
* Spec for resolving accounts with extension types
* Style tweaks for codeclimate
7 years ago
Lynx Kotoura
63f6da9a9d
Fix low-contrasted cancel button of reply indicator ( #7300 )
7 years ago