OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
6,571 Commits
137 Branches
269 Tags
1,018 MiB
Commit Graph

6571 Commits (94db024e4c42027e8c03bf0ecd2aec26ee73a56c)

Author SHA1 Message Date
ThibG 65b8880ec9
Merge pull request #442 from ThibG/glitch-soc/fixes/actions-modal-mobile 
Fix actions modal on mobile (fixes #441)
 2018-04-23 23:42:29 +02:00
Thibaut Girka 240833c023 Fix actions modal on mobile (fixes #441) 2018-04-23 23:18:36 +02:00
Emelia Smith 495303d9b8 Prevent suspended accounts from appearing in AccountSearchService (#7246) 2018-04-23 21:27:18 +02:00
Thibaut Girka 51d276fb98 [Glitch] Fix fullscreen video player 
Port 53b1d88873 to glitch-soc
 2018-04-23 20:38:08 +02:00
ThibG 53b1d88873 Fix fullscreen video player (fixes #7244) (#7245) 2018-04-23 20:12:16 +02:00
Akihiko Odaki 1258efa882 Paginate descendant statuses in public page (#7148) 2018-04-23 19:27:35 +02:00
Alejandro Martinez Ruiz 06817b3c1f tasks/mastodon: fix prompt for Redis password (#7241) 2018-04-23 16:03:58 +02:00
Marcin Mikołajczak 3ccca6cece 🌍: Make 🇵🇱 translation more consistent (#7239) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-23 18:49:03 +09:00
Yamagishi Kazutoshi 9613a53cb3 Update dependencies for Ruby (2018-04-23) (#7237) 
* Update annotate to version 2.7.3

* Update aws-sdk-s3 to version 1.9.2

* Update browser to version 2.5.3

* Update capistrano to version 3.10.2

* Update domain_name to version 0.5.20180417

* Update http to version 3.2.0

* Update lograge to version 0.10.0

* Update oj to version 3.5.1

* Update parallel_tests to version 2.21.3

* Update puma to version 3.11.4

* Update rubocop to version 0.55.0

* Update scss_lint to version 0.57.0

* Update simplecov to version 0.16.1

* Update tty-command to version 0.8.0

* Update tty-prompt to version 0.16.0

* Update pkg-config to version 1.3.0

* Update fog-local to version 0.5.0

* Update fog-openstack to version 0.1.25

* Update devise-two-factor to version 3.0.3

* bundle update
 2018-04-23 11:29:17 +02:00
Eugen Rochko 7db7d68136
Detect and prevent image bombs, max. processable dimension 4096^2 (#7229) 2018-04-23 09:16:38 +02:00
Yamagishi Kazutoshi 3bf6da1ffc Move precompile step to build stage (#7235) 2018-04-23 09:16:26 +02:00
Yamagishi Kazutoshi 0758b00bfd Refactor resizeImage method (#7236) 
- Use URL.createObjectURL (replace from FileReader)
- Use HTMLCanvasElement.prototype.toBlob
  (replace from HTMLCanvasElement.prototype.toDataURL)
- Use Promise (replace callback interface)
 2018-04-23 09:15:51 +02:00
Eugen Rochko 660cb058e1
Improve relative timestamps in web UI (#7233) 
Use short instead of numeric month, display year when different year

E.g.: "Apr 4" instead of "4/4", "Apr 4, 2017" if different year
 2018-04-23 00:43:53 +02:00
Eugen Rochko 05fb6f096d
Resize images before upload in web UI to reduce bandwidth (#7223) 
* Resize images before upload in web UI to reduce bandwidth

Fix #7218

* Fix issues

* Do not resize GIFs in JS
 2018-04-23 00:43:36 +02:00
Thibaut Girka 003d114332 [Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. 
Port 23106844a1 to glitch-soc
 2018-04-22 23:11:16 +02:00
Thibaut Girka 105ffaef8f [Glitch] Do not set emoji as inline-block 
Port 597948fb13 to glitch-soc
 2018-04-22 22:10:53 +02:00
Eugen Rochko 75c4ab9d12
Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) 
Fix #7011
 2018-04-22 22:09:03 +02:00
Thibaut Girka b383c0688a [Glitch] Do not overwrite some status attributes in reducer 
Backport 386365090c
 2018-04-22 19:19:01 +02:00
Thibaut Girka 64d8d0464d Add show more/less toggle for entire threads in web UI 
Inspired from b6003afcdb but using component
properties instead of redux store for hidden/revealed state.
 2018-04-22 19:19:01 +02:00
Thibaut Girka 2888f74c12 Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic 2018-04-22 19:18:15 +02:00
Thibaut Girka 259bc9840b [Glitch] Fix style of legacy column headers 
Backports daefbd66a6
 2018-04-22 19:17:10 +02:00
Thibaut Girka 63d671b18f [Glitch] Fix button hiding when header title is too long 
Port ffb2b8ef8c to glitch-soc
 2018-04-22 19:17:10 +02:00
Thibaut Girka abf7c5b850 [Glitch] Fix column headers accessibility 
Port 08e4c78e78 to glitch-soc.

SCSS fix inspired by 69f13e7bca.
 2018-04-22 19:17:10 +02:00
beatrix 06fc278e4c
Merge pull request #432 from ThibG/glitch-soc/features/reblog-private 
Glitchsoc-specific changes to allow boosting own private toots
 2018-04-22 12:32:58 -04:00
beatrix 8f1ec48cbe
Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api 
[Glitch] retrieve custom emoji list via API instead of before page load
 2018-04-22 12:10:48 -04:00
beatrix 125e8c7f5a
Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior 
Improve ScrollableList behavior
 2018-04-22 12:09:52 -04:00
beatrix cd5728b176
Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video 
Fix video player on toot public views
 2018-04-22 12:09:11 -04:00
beatrix 6fb610f865
Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering 
Status filtering fixes from upstream
 2018-04-22 12:08:12 -04:00
beatrix e88ce27855
Merge pull request #435 from ThibG/glitch-soc/features/public-modals 
[Glitch] Show media modal on public pages
 2018-04-22 12:07:29 -04:00
beatrix d7ae97c10a
Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses 
Add fade and margin to collapsed statuses
 2018-04-22 12:06:37 -04:00
Una Thompson 5f9b85a0cf Add fade and margin to collapsed statuses 2018-04-22 11:34:19 -04:00
Eugen Rochko 4ca2f73b12
Rescue Mastodon::LengthValidationError in Remoteable (#7228) 
Fix #7198 by allowing records with optional attachments to save
 2018-04-22 15:42:00 +02:00
jumoru b305a23933 Fix: Use "exportierten" instead of "exportieren" in translation (#7186) 
Spotted when looking at https://metalhead.club/@thomas/99881521526619858
 2018-04-22 14:46:19 +02:00
Lynx Kotoura 3c5006ec7f Fix text colors (#7227) 2018-04-22 14:29:40 +02:00
ThibG 597948fb13 Do not set emoji as inline-block (fixes #5743) (#7207) 2018-04-22 12:10:37 +02:00
David Baucum ca9192d9ba Ability to specify Redis passwd on mastodon:setup (#7222) 
Closes #7221
 2018-04-22 11:49:16 +02:00
Yamagishi Kazutoshi 648d645c2f Fix randomly fail (similar #7219) (#7225) 2018-04-22 11:41:39 +02:00
Matthias Beyer 3fa3161472 Fix: Use "welches" instead of "dass" in translation (#7185) 2018-04-22 12:28:12 +09:00
Yamagishi Kazutoshi 3f6893c641 Reset locale on registration tests (#7219) 2018-04-21 23:37:07 +02:00
Yamagishi Kazutoshi 9b8bb2a5df Replace badge to CircleCI (#7216) 2018-04-21 21:56:40 +02:00
Yamagishi Kazutoshi b8f0cfd6e3 Add parallel test processors (#7215) 2018-04-21 21:36:22 +02:00
Lynx Kotoura a4a36d994b Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
Yamagishi Kazutoshi d10447c3a8 Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
Eugen Rochko bfe26ef67b
Force convert to JPG for preview card thumbnails to avoid animations (#7109) 
* Force convert to JPG for preview card thumbnails to avoid animations

Fix #7093

* Conditionally convert to JPG only if original is GIF
Coalesce and strip on all formats to ensure no animated APNGs
 2018-04-21 21:34:36 +02:00
goofy-bz 1a27f9f46f one grammar fix (#7212) 2018-04-22 03:07:25 +09:00
Yamagishi Kazutoshi b438224751 Introduce rspec-retry (#7206) 2018-04-20 19:31:30 +02:00
unarist 84214b864c Ignore keyevents during text composition (#7205) 
KeyboardEvent.key may be physical key name (Escape, Tab, etc.)
even in text composition and it causes hotkeys or suggestion selection.
So we need to check e.which or e.isComposing.

Checking e.which also allows us to avoid Esc key on compositionend in Safari.
 2018-04-20 18:36:52 +02:00
Yamagishi Kazutoshi 87e3f0a41d Fix spec for sr-Latn (#7203) 2018-04-20 18:14:31 +02:00
TakesxiSximada 23106844a1 Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. (#7202) 
* Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline.

* Fix typo

* Add custom attribute prefix
 2018-04-20 18:14:21 +02:00
Thibaut Girka e4dff10934 Fix video player on toot public views 2018-04-20 16:08:46 +02:00