Eugen Rochko
b7f241faed
Do not count search route as compose being mounted in web UI ( #7372 )
...
Fix #7144
2018-05-05 23:05:43 +02:00
Thibaut Girka
8abac3dcb8
minor fix
2018-05-05 22:38:15 +02:00
Thibaut Girka
345d5aeba1
[Glitch] Add high-contrast theme
2018-05-05 22:33:02 +02:00
Thibaut Girka
18c7b739eb
Move attachment-lists out of lists.scss
2018-05-05 22:33:02 +02:00
Thibaut Girka
995eea1836
[Glitch] Fix text color in "show more" link inside boost confirmation modal
...
Port b5d0bf338c
to glitch-soc
2018-05-05 22:33:02 +02:00
Thibaut Girka
0bf81fde9b
Fix link colors in report modal
2018-05-05 22:33:02 +02:00
Thibaut Girka
c58ee84022
[Glitch] Add color variables of texts for better accesibility
...
Port e5ad96390e
and related to glitch-soc
2018-05-05 22:33:02 +02:00
Eugen Rochko
0de45574e0
4 profile fields max, store only 255 characters per name/value ( #7348 )
...
Fix #7303
2018-05-05 21:11:19 +02:00
Reto Kromer
d806eb8e59
uniform email rather than e-mail ( #7373 )
2018-05-05 21:03:21 +02:00
Eugen Rochko
ef1a273322
Fix handling of malformed ActivityPub payloads when URIs are nil ( #7370 )
...
* Fix handling of malformed ActivityPub payloads when URIs are nil
* Gracefully handle JSON-LD canonicalization failures
2018-05-05 18:22:34 +02:00
Thibaut Girka
a565aa6530
[Glitch] Update SCSS of admin and setting pages
...
Port the SCSS changes from 18d4e03e6b
to glitch-soc
2018-05-05 17:58:01 +02:00
Thibaut Girka
6c4ea9c000
[Glitch] Improve styling of closed registrations message
...
Port SCSS changes from f67fe3ebe8
to glitch-soc
2018-05-05 17:43:09 +02:00
Thibaut Girka
ca62d8bcc6
[Glitch] Do not re-position scroll when loading more (inserting items from below)
...
Port 554653a423
to glitch-soc
2018-05-05 17:18:55 +02:00
Thibaut Girka
1c75c7901f
[Glitch] Prevent timeline from moving when cursor is hovering over it
...
Port 9188537f5f
to glitch-soc
2018-05-05 17:18:25 +02:00
Thibaut Girka
eea6b78afc
Improve accessibility of toot dropdown menu
...
* Prevent Enter keypresses from triggering dropdown display toggle twice
* Give focus to first/selected item of dropdown menus
* Implement keyboard navigation in generic dropdown menus
Partial port from ef7d64c801
to glitch-soc
2018-05-05 17:11:48 +02:00
Thibaut Girka
02876fd33c
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
...
Port a661a25845
to glitch-soc
2018-05-05 16:58:20 +02:00
Shuhei Kitagawa
de918cee5a
Add tests for admin/custom_emojis_controller ( #7350 )
2018-05-05 15:53:59 +02:00
Eugen Rochko
9a84024b1e
Improve rendering of bio fields ( #7353 )
...
Fix #7335
2018-05-05 00:55:09 +02:00
Akihiko Odaki
575c5753e4
Fix gap insertion for timeline disconnection ( #7363 )
2018-05-05 00:54:56 +02:00
Eugen Rochko
8913ccb434
Store home feeds for 7 days instead of 14 ( #7354 )
...
* Store home feeds for 7 days instead of 14
Reduces workload for status fan-out to active followers
* Fix test for user model
2018-05-05 00:54:24 +02:00
ThibG
f0af3ac6b3
Dropdowns accessibility ( #7318 )
...
* Mark currently selected privacy setting in privacy dropdown
* Prevent Enter keypresses from triggering dropdown display toggle twice
* Give focus to first/selected item of dropdown menus
* Implement keyboard navigation in privacy dropdown
* Implement keyboard navigation in generic dropdown menus
2018-05-04 22:13:26 +02:00
Daggertooth
b60e38c985
Escape metachars in keywords
2018-05-04 14:58:11 -05:00
David Yip
087c79669a
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
db/schema.rb
2018-05-04 14:16:30 -05:00
Eugen Rochko
154076e8e7
Store URIs of follows, follow requests and blocks for ActivityPub ( #7160 )
...
Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.
2018-05-04 21:14:34 +02:00
Marcin Mikołajczak
73e3585042
Add a light theme
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04 20:25:58 +02:00
Jenkins
3fc6e7dabb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-04 18:17:32 +00:00
ThibG
8a6cba44aa
Do not render first page of following and followers collections unless explicitly asked to ( #7357 )
2018-05-04 20:17:01 +02:00
Eugen Rochko
93b8db8f08
Better pagination for ActivityPub outbox ( #7356 )
2018-05-04 19:19:11 +02:00
David Yip
ecdfcbf266
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
CONTRIBUTING.md
2018-05-04 12:16:12 -05:00
David Yip
ec2dc881dd
Merge branch 'merge-upstream' into gs-master
2018-05-04 12:04:55 -05:00
David Yip
ccb6a8e2d2
Merge pull request #456 from m4sk1n/glitch-contrast
...
“Enable” high contrast theme
2018-05-04 11:47:49 -05:00
Marcin Mikołajczak
e38c51da92
Improve “how to translate” ( #7358 )
2018-05-04 18:37:37 +02:00
Yamagishi Kazutoshi
00df2b623f
Add translate guide to CONTRIBUTING.md ( #7355 )
2018-05-04 18:01:12 +02:00
Marcin Mikołajczak
17fa2c7aa6
“Enable” high contrast theme
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04 17:50:11 +02:00
David Yip
c03d5b2c52
Remove duplicate posix-spawn entry from Gemfile.
2018-05-04 10:11:45 -05:00
David Yip
8ce630ee2e
Make posix-spawn spec in Gemfile match what's in Gemfile.lock.
2018-05-04 09:51:18 -05:00
David Yip
ea46024add
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
2018-05-04 09:42:31 -05:00
Eugen Rochko
d9eda62221
Show remote reports in admin UI as coming from domain rather than user ( #7347 )
...
Fix #6994
2018-05-04 13:26:25 +02:00
Eugen Rochko
860701a9a8
Marginally improve convert/ffmpeg calls performance with posix-spawn ( #7346 )
2018-05-04 13:22:23 +02:00
David Yip
b0dcceb9fe
Merge remote-tracking branch 'glitchsoc/master' into gs-master
2018-05-04 03:47:35 -05:00
David Yip
976347fa78
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-05-04 03:23:57 -05:00
David Yip
74be9b2f65
Merge pull request #453 from ThibG/glitch-soc/features/short-date
...
[Glitch] Improve relative timestamps in web UI
2018-05-04 03:08:28 -05:00
David Yip
587c2da0cf
Remove unused translations.
2018-05-04 03:01:10 -05:00
David Yip
dde7fa8bbe
Remove unnecessary code from MediaAttachment#set_type_and_extension.
...
Well, it seems unnecessary, anyway.
2018-05-04 02:38:04 -05:00
Shuhei Kitagawa
4a422a7eaa
Fix 2fa description in Japanese ( #7349 )
2018-05-04 13:58:08 +09:00
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
2018-05-03 17:23:44 -05:00
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
2018-05-03 23:02:46 +02:00
ThibG
554653a423
Do not re-position scroll when loading more (inserting items from below) ( #7344 )
2018-05-03 22:32:05 +02:00
Akihiko Odaki
854d974499
Add a missing question mark in rack_attack.rb ( #7338 )
2018-05-03 18:51:00 +02:00
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.
2018-05-03 17:32:00 +02:00