luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-09 08:25:55 +00:00
Code Issues Projects Releases Wiki Activity
6428 commits 1 branch 0 tags 248 MiB
Commit graph

6428 commits

This branch
This branch
All branches
Author SHA1 Message Date
beatrix 331190e5fb
Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility 
Improve accessibility of toot dropdown menu
 2018-05-06 12:12:20 -04:00
beatrix 92f192e9b1
Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement 
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
 2018-05-06 11:33:09 -04:00
beatrix 4480cd745f
Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over 
Prevent timeline from moving when cursor is hovering over it
 2018-05-06 11:32:56 -04:00
beatrix 06770656eb
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables 
Add text color variables + minor SCSS fixes + high contrast skin
 2018-05-06 11:32:42 -04:00
beatrix e56639258a
Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes 
Escape regex metachars in keyword mutes
 2018-05-06 11:32:22 -04:00
beatrix 35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items 
Support upstream bio items / custom account fields
 2018-05-06 11:32:05 -04:00
Thibaut Girka 65349bc155 Fix color of status icons in glitch-soc high contrast skin 2018-05-06 11:31:05 +02:00
ThibG af4fb72993
Merge pull request #457 from m4sk1n/glitch-light 
Add a light theme by @Sylvhem
 2018-05-06 11:21:26 +02:00
Thibaut Girka 2d065ceaf6 minor fix 2018-05-05 22:38:15 +02:00
Thibaut Girka f7a076eded [Glitch] Add high-contrast theme 2018-05-05 22:33:02 +02:00
Thibaut Girka caebf69e77 Move attachment-lists out of lists.scss 2018-05-05 22:33:02 +02:00
Thibaut Girka bd3b9bf7b9 [Glitch] Fix text color in "show more" link inside boost confirmation modal 
Port ba917e15f6 to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka 983328376b Fix link colors in report modal 2018-05-05 22:33:02 +02:00
Thibaut Girka b3a236637e [Glitch] Add color variables of texts for better accesibility 
Port 74dae9458d and related to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka 390cfdef2e [Glitch] Update SCSS of admin and setting pages 
Port the SCSS changes from cb74c0cfe4 to glitch-soc
 2018-05-05 17:58:01 +02:00
Thibaut Girka 9edc5cafe4 [Glitch] Improve styling of closed registrations message 
Port SCSS changes from 5acd5315f2 to glitch-soc
 2018-05-05 17:43:09 +02:00
Thibaut Girka 32974a58dc [Glitch] Do not re-position scroll when loading more (inserting items from below) 
Port 8c601b54cc to glitch-soc
 2018-05-05 17:18:55 +02:00
Thibaut Girka 553cc28240 [Glitch] Prevent timeline from moving when cursor is hovering over it 
Port 58852695c8 to glitch-soc
 2018-05-05 17:18:25 +02:00
Thibaut Girka cee157fc19 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 bfa5bdde2c [Glitch] Place emoji picker top if it is closer to the bottom of the viewport 
Port ad5d3134e4 to glitch-soc
 2018-05-05 16:58:20 +02:00
Daggertooth b25278180a Escape metachars in keywords 2018-05-04 14:58:11 -05:00
Marcin Mikołajczak 4c2b522a60 Add a light theme 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-04 20:25:58 +02:00
Jenkins cb62935c0b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-04 18:17:32 +00:00
Eugen Rochko 2c1f7b2ece
Better pagination for ActivityPub outbox (#7356) 2018-05-04 19:19:11 +02:00
David Yip b316d373ea
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	CONTRIBUTING.md
 2018-05-04 12:16:12 -05:00
David Yip 2058922cc9
Merge branch 'merge-upstream' into gs-master 2018-05-04 12:04:55 -05:00
David Yip 1aa25ee0f5
Merge pull request #456 from m4sk1n/glitch-contrast 
“Enable” high contrast theme
 2018-05-04 11:47:49 -05:00
Marcin Mikołajczak d181aad033 Improve “how to translate” (#7358) 2018-05-04 18:37:37 +02:00
Yamagishi Kazutoshi 00ff8dc00a Add translate guide to CONTRIBUTING.md (#7355) 2018-05-04 18:01:12 +02:00
Marcin Mikołajczak a7a61889d7 “Enable” high contrast theme 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-04 17:50:11 +02:00
David Yip 54e80bec73
Remove duplicate posix-spawn entry from Gemfile. 2018-05-04 10:11:45 -05:00
David Yip e41332c37b
Make posix-spawn spec in Gemfile match what's in Gemfile.lock. 2018-05-04 09:51:18 -05:00
David Yip 77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	Gemfile.lock
 2018-05-04 09:42:31 -05:00
Eugen Rochko 251bbf9728
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 a78b27c7cc
Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346) 2018-05-04 13:22:23 +02:00
David Yip c511b0f72a
Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-05-04 03:47:35 -05:00
David Yip da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-04 03:23:57 -05:00
David Yip 63f848ac8c
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 2d392fb3b8
Remove unused translations. 2018-05-04 03:01:10 -05:00
David Yip 106a5d7b83
Remove unnecessary code from MediaAttachment#set_type_and_extension. 
Well, it seems unnecessary, anyway.
 2018-05-04 02:38:04 -05:00
Shuhei Kitagawa c61ddd8249 Fix 2fa description in Japanese (#7349) 2018-05-04 13:58:08 +09:00
David Yip c816701550
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 a24605961a Fixes/do not override timestamps (#7336) 
* Revert "Fixes/do not override timestamps (#7331)"

This reverts commit 581a5c9d29.

* 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 8c601b54cc Do not re-position scroll when loading more (inserting items from below) (#7344) 2018-05-03 22:32:05 +02:00
Akihiko Odaki a7e71bbd08 Add a missing question mark in rack_attack.rb (#7338) 2018-05-03 18:51:00 +02:00
Akihiko Odaki b1d4471e36 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
Yamagishi Kazutoshi 7495a3470e Add el and te (#7332) 
* Add el and te

* Add missing locale files
 2018-05-03 15:54:10 +02:00
Yamagishi Kazutoshi e9c5c16ba0 Delete dump.rdb (#7334) 2018-05-03 14:30:18 +02:00
ThibG 581a5c9d29 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.
 2018-05-03 13:33:08 +02:00
Eugen Rochko d5fa4fbcd2
Revert "Do not override timestamps for incoming toots" (#7330) 
* Revert "Weblate translations 20180503 (#7325)"

This reverts commit dfa6bccb64.

* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)"

This reverts commit 58852695c8.

* Revert "Add pry-byebug (#7307)"

This reverts commit ab773e4d5f.

* Revert "Do not override timestamps for incoming toots (#7326)"

This reverts commit bd36791832.
 2018-05-03 12:32:33 +02:00