me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6497 commits 2 branches 0 tags 429 MiB
Commit graph

6497 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
eafdb65af9 [Glitch] Fix contact info styling on landing page 2018-05-11 16:05:47 +02:00
Thibaut Girka
951dee676d Update SCSS for tables 2018-05-11 14:48:19 +02:00
Thibaut Girka
fe36fabef1 Update SCSS for statuses public view 2018-05-11 14:43:26 +02:00
Thibaut Girka
944bac0b41 [Glitch] Adjust RTL styles for landing page 
Port aef3f2775e to glitch-soc
 2018-05-11 14:34:23 +02:00
Thibaut Girka
5c96717144 Update forms SCSS from upstream 2018-05-11 14:31:18 +02:00
Thibaut Girka
86c477df23 Update SCSS to match “Show card modal on public pages” 2018-05-11 14:20:46 +02:00
Thibaut Girka
d0641e77ac Update SCSS for about/landing page 2018-05-11 14:18:52 +02:00
Thibaut Girka
2a85b97eb6 Update admin page SCSS from upstream 2018-05-11 14:13:59 +02:00
ThibG
8a5f111c00 Merge pull request #472 from ThibG/glitch-soc/merge 
Merge upstream changes
 2018-05-10 00:28:54 +02:00
Thibaut Girka
0033dbd115 Add bot badge to account headers in the WebUI 2018-05-10 00:05:08 +02:00
Thibaut Girka
2e2758c25e Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka
b8f8a3ea58 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Thibaut Girka
5b46a6002f Ignore tootsuite-specific theme-related translation strings 2018-05-10 00:03:34 +02:00
Thibaut Girka
af504e62ff 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
e60292c616 Disable simplecov on CircleCI (#7416) 
* Disable simplecov on CircleCI

* Remove --format progress
 2018-05-09 16:59:58 +02:00
Yamagishi Kazutoshi
1b42ea9f2c Support gzip encoding on Request (#7425) 2018-05-09 16:59:39 +02:00
Yamagishi Kazutoshi
d006271514 Show card modal on public pages (#7428) 2018-05-09 16:22:52 +02:00
Marcin Mikołajczak
cbb7f33083 🌍: 🇵🇱⬆️ (#7427) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-09 19:20:49 +09:00
Shuhei Kitagawa
fcac2f1b60 Add tests for admin/roles_controller (#7421) 2018-05-09 08:41:46 +02:00
Shuhei Kitagawa
db644968ce Add tests for admin/invites_controller (#7412) 2018-05-09 08:41:26 +02:00
Yamagishi Kazutoshi
e59fb1b969 Correct rotate of image using EXIF (#7422) 2018-05-09 08:41:07 +02:00
Yamagishi Kazutoshi
6092325a48 Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424) 2018-05-09 08:39:08 +02:00
David Yip
106a0d5c70 Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-05-08 09:43:33 -05:00
Yamagishi Kazutoshi
4fea89fe4a Multiple Issue templates (#7402) 
* Multiple Issue templates

* Update bug_report.md
 2018-05-08 13:35:33 +02:00
Yamagishi Kazutoshi
c1427f90f6 Show media modal on public timeline (#7413) 2018-05-08 13:33:09 +02:00
Surinna Curtis
a2b84b644b Take the first recognized actor_type. (#7410) 2018-05-08 13:30:04 +02:00
ThibG
8ccc863ae8 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
10be4c496c Fix hashtags not being federated on mentions (fixes #6900) (#7406) 2018-05-08 03:36:59 +02:00
beatrix
e774936358 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
bac3fc9706 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
3333cce41e 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
49181d497f [Glitch] Allow report modal to be up to 80% of viewport height 
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka
d5e0e665df [Glitch] Also display replies in report modal 
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
 2018-05-07 14:55:16 +02:00
Eugen Rochko
244a270a80 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
557db7ae6d Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
Eugen Rochko
7ff3c849d1 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
b890e5830c Support explicitly supplying language code for status via REST API (#7389) 2018-05-07 09:30:53 +02:00
Eugen Rochko
8b63d39427 Use plaintext value for field value tooltips in web UI (#7388) 
Fix #7383
 2018-05-07 09:30:38 +02:00
abcang
b9c17c6580 Fix distribute_add_activity and distribute_remove_activity (#7393) 2018-05-07 09:30:18 +02:00
Hugo Gameiro
27cfb13b83 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
93553c17c8 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
d01cb2c8e3 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
3a7bebf8c4 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
796fe4c361 Fixes/rollback scroll changes (#7387) 
* Revert "Do not re-position scroll when loading more (inserting items from below) (#7344)"

This reverts commit 554653a423.

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

This reverts commit 9188537f5f.
 2018-05-06 22:26:39 +02:00
Thibaut Girka
04a8aef9d2 Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" 
This reverts commit 1c75c7901f.
 2018-05-06 21:50:33 +02:00
Thibaut Girka
82421dc2e2 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" 
This reverts commit ca62d8bcc6.
 2018-05-06 21:50:26 +02:00
Thibaut Girka
1bc1d8e676 Fix glitch high-contrast skin text colors 
Port from e0c3d950d1
 2018-05-06 21:00:35 +02:00
ThibG
520f3a28fc Various improvements to the report UI (#7342) 
* Also display replies in report modal

* Allow report modal to be up to 80% of viewport height

* Use narrow no-break space where needed in the French translation
 2018-05-06 20:38:17 +02:00
beatrix
f5f840cdb3 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
923e79ea00 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