fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 23:22:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
6500 commits 131 branches 269 tags 986 MiB
Commit graph

6500 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThibG e7ed61917b
Merge pull request #475 from ThibG/fixes/update-scss 
Update SCSS from upstream
 2018-05-11 16:51:14 +02:00
ThibG 479e5bbd4a
Merge pull request #474 from ThibG/glitch-soc/fixes/html-ified-tooltip 
[Glitch] Use plaintext value for field value tooltips in web UI
 2018-05-11 16:26:23 +02:00
Thibaut Girka 6284039832 [Glitch] Fix contact info styling on landing page 2018-05-11 16:05:47 +02:00
Thibaut Girka f2e5ed6841 Update SCSS for tables 2018-05-11 14:48:19 +02:00
Thibaut Girka 8860f14ef0 Update SCSS for statuses public view 2018-05-11 14:43:26 +02:00
Thibaut Girka 4a1040c4cb [Glitch] Adjust RTL styles for landing page 
Port 8bf3e750ab to glitch-soc
 2018-05-11 14:34:23 +02:00
Thibaut Girka e8644f3a4b Update forms SCSS from upstream 2018-05-11 14:31:18 +02:00
Thibaut Girka 4cd65fe074 Update SCSS to match “Show card modal on public pages” 2018-05-11 14:20:46 +02:00
Thibaut Girka 1a4d735b1d Update SCSS for about/landing page 2018-05-11 14:18:52 +02:00
Thibaut Girka db73c0bc5d Update admin page SCSS from upstream 2018-05-11 14:13:59 +02:00
Thibaut Girka f6ec8c4821 [Glitch] Use plaintext value for field value tooltips in web UI 
Port d185f3ddaf to glitch-soc

This doesn't change anything for glitch-style fields, but those will go
away eventually
 2018-05-10 14:11:23 +02:00
ThibG 34142ab29c
Merge pull request #472 from ThibG/glitch-soc/merge 
Merge upstream changes
 2018-05-10 00:28:54 +02:00
Thibaut Girka 5d8052e715 Add bot badge to account headers in the WebUI 2018-05-10 00:05:08 +02:00
Thibaut Girka 2f01935cba Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka 30bb530c70 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Thibaut Girka a8be40933d Ignore tootsuite-specific theme-related translation strings 2018-05-10 00:03:34 +02:00
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
 2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi ac788ad47e Disable simplecov on CircleCI (#7416) 
* Disable simplecov on CircleCI

* Remove --format progress
 2018-05-09 16:59:58 +02:00
Yamagishi Kazutoshi edf882320a Support gzip encoding on Request (#7425) 2018-05-09 16:59:39 +02:00
Yamagishi Kazutoshi 16fee0335f Show card modal on public pages (#7428) 2018-05-09 16:22:52 +02:00
Marcin Mikołajczak dc010cc77a 🌍: 🇵🇱⬆️ (#7427) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-09 19:20:49 +09:00
Shuhei Kitagawa ce35d81db7 Add tests for admin/roles_controller (#7421) 2018-05-09 08:41:46 +02:00
Shuhei Kitagawa 35eff337d5 Add tests for admin/invites_controller (#7412) 2018-05-09 08:41:26 +02:00
Yamagishi Kazutoshi 6832110af4 Correct rotate of image using EXIF (#7422) 2018-05-09 08:41:07 +02:00
Yamagishi Kazutoshi d2ee48977c Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424) 2018-05-09 08:39:08 +02:00
David Yip 143878d9da
Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-05-08 09:43:33 -05:00
Yamagishi Kazutoshi 40097f438b Multiple Issue templates (#7402) 
* Multiple Issue templates

* Update bug_report.md
 2018-05-08 13:35:33 +02:00
Yamagishi Kazutoshi e0b1e17bd0 Show media modal on public timeline (#7413) 2018-05-08 13:33:09 +02:00
Surinna Curtis 01dfd6dbc8 Take the first recognized actor_type. (#7410) 2018-05-08 13:30:04 +02:00
ThibG b1938d7853 Do not crash in getStatusIds when there is a gap in the timeline (fixes #7400) (#7415) 
Fixes a crash occurring when the “gap” disconnection indicator is to be
displayed in a filtered timeline.
 2018-05-08 13:28:55 +02:00
ThibG 993e68a7dd Fix hashtags not being federated on mentions (fixes #6900) (#7406) 2018-05-08 03:36:59 +02:00
beatrix 919e2098cb
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements 
Various improvements to the reports modal
 2018-05-07 09:45:13 -04:00
beatrix 2eb924c00c
Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-color 
Fix color of disabled boost buttons (fixes #466)
 2018-05-07 09:21:32 -04:00
Thibaut Girka 658ac4396c Hide media in report modal regardless of whether they are marked sensitive 
The rationale behind this is that if the user wants to report violent media,
they might not want to see it repeatedly. The “sensitive” property is still
kept, displaying different messages for hidden media depending on whether
they are marked as sensitive.
 2018-05-07 15:00:55 +02:00
Thibaut Girka 6b94237810 [Glitch] Allow report modal to be up to 80% of viewport height 
Port bddb330a8a to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka 7972464e71 [Glitch] Also display replies in report modal 
Port c88e12fca6 to glitch-soc
 2018-05-07 14:55:16 +02:00
Eugen Rochko 6208ea5a53
If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398) 
* If an OStatus message contains nsfw hashtag, mark it as sensitive

Undo parts of #7048

* Put nsfw hashtag on OStatus messages if they have any media

* Fix code style issues
 2018-05-07 14:49:13 +02:00
Thibaut Girka ffdb85f859 Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
Eugen Rochko 42cd363542
Bot nameplates (#7391) 
* Store actor type in database

* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365

* Fix code style issues
 2018-05-07 09:31:07 +02:00
Eugen Rochko 0f0cc3f2eb
Support explicitly supplying language code for status via REST API (#7389) 2018-05-07 09:30:53 +02:00
Eugen Rochko d185f3ddaf
Use plaintext value for field value tooltips in web UI (#7388) 
Fix #7383
 2018-05-07 09:30:38 +02:00
abcang db012b57c2 Fix distribute_add_activity and distribute_remove_activity (#7393) 2018-05-07 09:30:18 +02:00
Hugo Gameiro ea4e243303 Improve OpenStack v3 compatibility (#7392) 
* Update paperclip.rb

* Update .env.production.sample

* Update paperclip.rb
 2018-05-07 02:28:28 +02:00
Eugen Rochko 95595ccd21
Add Corsican localization (#7390) 
* Added Corsican localization

* Declaring Corsican localization

* Fixed activerecord locale

* Added a missing translation and switched to French-style apostrophes

* Fixed a (predictable) mistake made while bulk-replacing apostrophes

* More fixing

* i18n-tasks normalize
 2018-05-07 01:34:19 +02:00
David Yip 2e25da4da0
Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes 
Glitch soc/rollback scroll changes
 2018-05-06 17:39:07 -05:00
David Yip a0629c5696
Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colors 
Fix glitch high-contrast skin text colors
 2018-05-06 17:38:58 -05:00
ThibG e06fbc4fcf Fixes/rollback scroll changes (#7387) 
* Revert "Do not re-position scroll when loading more (inserting items from below) (#7344)"

This reverts commit 8c601b54cc.

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

This reverts commit 58852695c8.
 2018-05-06 22:26:39 +02:00
Thibaut Girka de7feea30e Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" 
This reverts commit 553cc28240.
 2018-05-06 21:50:33 +02:00
Thibaut Girka 4133f70902 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" 
This reverts commit 32974a58dc.
 2018-05-06 21:50:26 +02:00
Thibaut Girka 1adca9b040 Fix glitch high-contrast skin text colors 
Port from 3c5006ec7f
 2018-05-06 21:00:35 +02:00