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

9639 commits

This branch
This branch
All branches
Author SHA1 Message Date
nzws
3d860417a5 [Glitch] Fix stacking order of emoji picker 
Port 1fbe5c2fec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-23 19:16:42 +02:00
Thibaut Girka
d445d5833e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
 2019-05-23 19:01:30 +02:00
ThibG
f5637b174f Move signature verification stoplight to the requests themselves (#10813) 
* Move signature verification stoplight to the requests themselves

This avoids blocking messages from known keys for 5 minutes when only one fails…

* Put the stoplight on the actual client IP, not a potential reverse proxy
 2019-05-23 15:22:39 +02:00
Yamagishi Kazutoshi
3371452f77 Add sponsor button to GitHub web UI (#10814) 
- https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
 2019-05-23 15:00:54 +02:00
ThibG
4eaa4a649e Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812) 
HTTP 401 responses returned by Mastodon's inbox controller may
be temporary if, for instance, the requesting user's actor/key json
could not be retrieved in a timely fashion. This changes allow retries
instead of dropping the message entirely.

Also added HTTP 408 as that error is by nature temporary.
 2019-05-23 15:00:30 +02:00
Thibaut Girka
9a101b91ae Make headers font size proportional 2019-05-23 12:41:38 +02:00
Thibaut Girka
3117d0ac70 Allow rel=tag in status text 
Fixes tag links in local Markdown or HTML-authored statuses
 2019-05-23 12:28:33 +02:00
Eugen Rochko
f9ca3d62b6 Add forceSingleColumn prop to <UI /> (#10807) 
* Move TabsBar rendering logic from CSS to the ColumnsArea component

* Add forceSingleColumn mode

* Add unread notifications counter to tabs bar

* Add toggle to control `forceSingleColumn`

* Increase paddings in mobile layout responsively at large sizes
 2019-05-23 01:35:22 +02:00
abcang
81768812f9 Migrate from uws to cws (#10805) 2019-05-22 18:19:16 +02:00
nzws
1fbe5c2fec Fix stacking order of emoji picker (#10801) 2019-05-22 18:00:34 +02:00
dependabot[bot]
88029fd2ab Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.39.0...v1.40.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 22:31:05 +09:00
dependabot[bot]
8ad21993a8 Bump rubocop from 0.69.0 to 0.70.0 (#10802) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.69.0...v0.70.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 22:09:10 +09:00
dxwc
0a1ba7c14b i18n: Complete frontend Bengali translation (#10800) 
* i18n: Complete frontend Bengali translation

* run yarn manage:translations
 2019-05-22 10:00:58 +09:00
Thibaut Girka
a93c6f708b Fix local text/html toots not being sanitized 2019-05-21 23:12:43 +02:00
trwnh
140a741979 Update remote bio test from 160 to 500 (#10799) 2019-05-21 13:29:06 +02:00
Paul Woolcock
626844dfb1 Add account_id param to GET /api/v1/notifications (#10796) 
* Add `from_account` to notifications API

this adds the ability to filter notifications by the account they
originated from

* passing a non-existent user should cause none to be returned

* Fix codeclimate warnings

* fix more codeclimate warnings

* make requested changes:

* use account id instead of user@domain
* name the param `account_id` instead of `from_account`

* Don't use `return` in a lambda
 2019-05-21 13:28:49 +02:00
dependabot[bot]
329286f4f9 Bump httplog from 1.2.2 to 1.3.0 (#10795) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/commits/v1.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-21 15:41:15 +09:00
Thibaut Girka
a0b7246388 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Marek Ľach
42bdd0766d Update sk.yml (#10788) 
* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* normalize
 2019-05-20 15:42:19 +09:00
dependabot[bot]
cb37c92e7b Bump lograge from 0.11.0 to 0.11.1 (#10793) 
Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.0 to 0.11.1.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.0...v0.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 15:19:56 +09:00
dependabot[bot]
584ab2879e Bump capybara from 3.20.0 to 3.20.2 (#10794) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.0 to 3.20.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.20.0...3.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 15:18:28 +09:00
Thibaut Girka
0bc9d4f6d3 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
trwnh
d8e5268939 Change bio limit from 160 to 500 (#10790) 
* Change note_length validator from 160 to 500

* Change input maxlength from 160 to 500

* update bio test from 160 to 500

* Multiply a string 30 times instead of 10
 2019-05-19 22:51:44 +02:00
ThibG
d428d2923d Merge pull request #1055 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-19 22:07:42 +02:00
Thibaut Girka
e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
ThibG
6f6382d81c Merge pull request #1054 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-19 21:52:27 +02:00
ThibG
4ad004d2ef Fix “invited by” not showing up for invited accounts in admin interface (#10791) 2019-05-19 21:40:36 +02:00
Marek Ľach
7a88a5b44a sk.yml grammar update (#10786) 
* sk.yml grammar update

* bundle exec i18n-tasks normalize
 2019-05-20 02:27:32 +09:00
Hinaloe
4de9bd3870 fix isSubmitting prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka
fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Marek Ľach
875d18d636 Small corrections for sk translation (#10784) 2019-05-19 22:42:10 +09:00
ThibG
b96cc31682 Add post-deployment migration script to delete public-boosts-of-private-toots (#10783) 2019-05-19 13:49:31 +02:00
Shlee
decaffc020 Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 2019-05-19 11:29:26 +02:00
Aditoo17
7660ac5008 I18n: Update Czech translation (#10781) 2019-05-19 14:39:16 +09:00
Ben Lubar
8ec309ee64 add og:image:alt for media attachments in embeds (#10779) 2019-05-18 20:57:45 +02:00
Eugen Rochko
3a4761c665 Change poll options to alphabetic letters when status text is hidden (#10685) 
Fix #10569
 2019-05-18 14:41:16 +02:00
Yusuke Nakamura
bf0766358b Remove 'Weblate' from CONTRIBUTING.md (#10778) 
The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)
 2019-05-18 14:40:55 +02:00
ThibG
66430720c1 Merge pull request #1053 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-18 10:18:52 +02:00
Thibaut Girka
08a793cbd9 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
ThibG
1fec2ff78f Prevent from publicly boosting one's own private toots (#10775) 2019-05-18 00:28:51 +02:00
Thibaut Girka
d48d1ed534 Minor optimization 2019-05-17 23:51:14 +02:00
Thibaut Girka
b83cdc9b02 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka
3d03d084cd Properly escape HTML in code blocks 2019-05-17 23:51:14 +02:00
Thibaut Girka
7aece1eec5 Add option for default toot content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka
ee3dfdf6a1 Fix autolinking, and newlines in code blocks 
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
 2019-05-17 23:51:14 +02:00
Thibaut Girka
dfeda8857f Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier
76d58bf63e Content-Type Dropdown: use the selected option icon for the menu 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka
8a49df8ede Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi
08a981dd25 Add status content type dropdown to compose box. 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka
91ab9e2e4f Add API support for setting status content-type 2019-05-17 23:51:14 +02:00