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

38629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
cab7e62235 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
Thibaut Girka
fae53e1a39 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
ThibG
36a6089a22 Add a “Block & Report” button to the block confirmation dialog (#10360) 2019-03-26 17:34:02 +01:00
ThibG
6df4a82969 Add a “Block & Report” button to the block confirmation dialog (#10360) 2019-03-26 17:34:02 +01:00
ThibG
cffb8cb38d Fix HTML validation (#10354) 
* Fix HTML validation

* Report first HTML error instead on validation error
 2019-03-26 17:33:26 +01:00
ThibG
0c46bd11aa Fix HTML validation (#10354) 
* Fix HTML validation

* Report first HTML error instead on validation error
 2019-03-26 17:33:26 +01:00
Aditoo17
70a78d968f Make clicking on avatar open public profile in new tab (#10387) 2019-03-26 17:33:07 +01:00
Aditoo17
6f6abc369f Make clicking on avatar open public profile in new tab (#10387) 2019-03-26 17:33:07 +01:00
Hinaloe
824dc7c6b9 [Glitch] Do not set CSRF Token when no csrf header 
Port cc670c3234 to glitch-soc
 2019-03-26 16:12:46 +01:00
Hinaloe
872eab5784 [Glitch] Do not set CSRF Token when no csrf header 
Port 68f2211f00 to glitch-soc
 2019-03-26 16:12:46 +01:00
Eugen Rochko
36daf28215 [Glitch] Change icons of features on admin dashboard to remove bias 
Port SCSS changes from 88a85f2574 to glitch-soc
 2019-03-26 16:11:30 +01:00
Eugen Rochko
89a0fa3053 [Glitch] Change icons of features on admin dashboard to remove bias 
Port SCSS changes from e117964325 to glitch-soc
 2019-03-26 16:11:30 +01:00
Eugen Rochko
f6767a00d4 [Glitch] Add lang attribute to statuses in web UI 
Port JS changes from 0e730974cd to glitch-soc
 2019-03-26 16:09:59 +01:00
Eugen Rochko
614bd3f8d4 [Glitch] Add lang attribute to statuses in web UI 
Port JS changes from e6cfa7ab89 to glitch-soc
 2019-03-26 16:09:59 +01:00
ThibG
a1cc930335 [Glitch] Do not empty timeline of blocked users on block 
Port 248de99443 to glitch-soc
 2019-03-26 16:07:47 +01:00
ThibG
d680c61993 [Glitch] Do not empty timeline of blocked users on block 
Port 94aceb85ad to glitch-soc
 2019-03-26 16:07:47 +01:00
Thibaut Girka
1f70b51fff Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
 2019-03-26 16:02:54 +01:00
Thibaut Girka
b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
 2019-03-26 16:02:54 +01:00
Eugen Rochko
f37800e097 [Glitch] Add custom closed registrations message to landing page when set 
Port SCSS changes from b4c64dcccc to glitch-soc
 2019-03-26 16:01:59 +01:00
Eugen Rochko
648cf8bfd5 [Glitch] Add custom closed registrations message to landing page when set 
Port SCSS changes from 55a9658ad8 to glitch-soc
 2019-03-26 16:01:59 +01:00
Thibaut Girka
e97d76632d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
 2019-03-26 16:01:59 +01:00
Thibaut Girka
fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
 2019-03-26 16:01:59 +01:00
dependabot[bot]
4527b357ef Bump makara from 0.4.0 to 0.4.1 (#10382) 
Bumps [makara]() from 0.4.0 to 0.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 12:53:11 +01:00
dependabot[bot]
0c1a05b281 Bump makara from 0.4.0 to 0.4.1 (#10382) 
Bumps [makara]() from 0.4.0 to 0.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 12:53:11 +01:00
Hinaloe
cc670c3234 Do not set CSRF Token when no csrf header (#10383) 2019-03-26 11:13:20 +01:00
Hinaloe
68f2211f00 Do not set CSRF Token when no csrf header (#10383) 2019-03-26 11:13:20 +01:00
dependabot[bot]
d5483234a8 Bump dotenv-rails from 2.7.1 to 2.7.2 (#10381) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.1...v2.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 18:37:04 +09:00
dependabot[bot]
792a0f106e Bump dotenv-rails from 2.7.1 to 2.7.2 (#10381) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.1...v2.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 18:37:04 +09:00
dependabot[bot]
1ec7d1a391 Bump nokogiri from 1.10.1 to 1.10.2 (#10380) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.1...v1.10.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 18:36:17 +09:00
dependabot[bot]
6968ae79a0 Bump nokogiri from 1.10.1 to 1.10.2 (#10380) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.1...v1.10.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 18:36:17 +09:00
mayaeh
798d9a6b4a Fix menu items that don't action (#10379) 2019-03-26 05:31:09 +01:00
mayaeh
186f7bcbb6 Fix menu items that don't action (#10379) 2019-03-26 05:31:09 +01:00
Eugen Rochko
88a85f2574 Change icons of features on admin dashboard to remove bias (#10366) 
Red crosses implied that it was bad/unexpected that certain features
were not enabled. In reality, they are options, so showing a green
or grey power-off icon is more appropriate.

Add status of timeline preview as well

Fix sample accounts changing too frequently due to wrong query

Sample accounts are intended to be sorted by popularity
 2019-03-26 01:24:19 +01:00
Eugen Rochko
e117964325
Change icons of features on admin dashboard to remove bias (#10366) 
Red crosses implied that it was bad/unexpected that certain features
were not enabled. In reality, they are options, so showing a green
or grey power-off icon is more appropriate.

Add status of timeline preview as well

Fix sample accounts changing too frequently due to wrong query

Sample accounts are intended to be sorted by popularity
 2019-03-26 01:24:19 +01:00
Eugen Rochko
a8bb10633d Add blocked_by relationship to the REST API (#10373) 2019-03-26 01:24:09 +01:00
Eugen Rochko
9745de883b
Add blocked_by relationship to the REST API (#10373) 2019-03-26 01:24:09 +01:00
Eugen Rochko
0e730974cd Change language detector threshold from 140 characters to 4 words (#10376) 
Add `lang` attribute to statuses in web UI
 2019-03-26 01:23:59 +01:00
Eugen Rochko
e6cfa7ab89
Change language detector threshold from 140 characters to 4 words (#10376) 
Add `lang` attribute to statuses in web UI
 2019-03-26 01:23:59 +01:00
Eugen Rochko
ff61c88d7e Improve performance of list of blocked domains by caching counts (#10374) 2019-03-26 00:36:35 +01:00
Eugen Rochko
94e5e834f2
Improve performance of list of blocked domains by caching counts (#10374) 2019-03-26 00:36:35 +01:00
Eugen Rochko
858bc12635 Redesign profile column in web UI to match design on public pages (#10337) 
* Redesign profile column in web UI to match design on public pages

* Make the tab links text bolder
 2019-03-26 00:36:25 +01:00
Eugen Rochko
a96181f16f
Redesign profile column in web UI to match design on public pages (#10337) 
* Redesign profile column in web UI to match design on public pages

* Make the tab links text bolder
 2019-03-26 00:36:25 +01:00
dependabot[bot]
030837582e Bump aws-sdk-s3 from 1.34.0 to 1.35.0 (#10369) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.34.0 to 1.35.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.34.0...v1.35.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 20:54:00 +01:00
dependabot[bot]
ac0cc692f5 Bump aws-sdk-s3 from 1.34.0 to 1.35.0 (#10369) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.34.0 to 1.35.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.34.0...v1.35.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 20:54:00 +01:00
dependabot[bot]
25e08b6f91 Bump rack-cors from 1.0.2 to 1.0.3 (#10368) 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/cyu/rack-cors/releases)
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 15:27:46 +01:00
dependabot[bot]
035828f8c0 Bump rack-cors from 1.0.2 to 1.0.3 (#10368) 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/cyu/rack-cors/releases)
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 15:27:46 +01:00
rinsuki
74e9a4dec4 Add allowfullscreen attribute to oembed iframe (#10370) 
for video player full screen button.
 2019-03-25 15:01:09 +01:00
rinsuki
d8b6431aa7 Add allowfullscreen attribute to oembed iframe (#10370) 
for video player full screen button.
 2019-03-25 15:01:09 +01:00
ThibG
248de99443 Do not empty timeline of blocked users on block (#10359) 
Fixes #10226
 2019-03-24 19:15:58 +01:00
ThibG
94aceb85ad Do not empty timeline of blocked users on block (#10359) 
Fixes #10226
 2019-03-24 19:15:58 +01:00