Eugen Rochko
026dd75208
Add tootctl self-destruct
( #10367 )
...
Fix #10305
2019-03-28 17:56:25 +01:00
ThibG
bb316fafff
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-28 15:12:33 +01:00
Thibaut Girka
050efbc126
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
dependabot[bot]
24d5b6f9e3
Bump aws-sdk-s3 from 1.35.0 to 1.36.0 ( #10406 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.35.0 to 1.36.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.35.0...v1.36.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-28 16:25:27 +09:00
dependabot[bot]
85629bf3d3
Bump rails from 5.2.2.1 to 5.2.3 ( #10407 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-28 16:25:11 +09:00
Eugen Rochko
f1bc90ab50
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
2019-03-28 04:44:59 +01:00
dependabot[bot]
f46f67d984
[Security] Bump devise from 4.5.0 to 4.6.2 ( #10394 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-28 02:20:53 +01:00
Eugen Rochko
5d41532d94
Add tootctl search deploy
to avoid ugly rake task syntax ( #10403 )
2019-03-28 02:16:11 +01:00
Eugen Rochko
08ec7435ce
Add order options to relationship manager UI ( #10404 )
2019-03-28 02:16:01 +01:00
Eugen Rochko
683013756e
Revert locales touched by automated translations ( #10399 )
...
* Revert ruined translations
Regression from #10362
* yarn manage:translations
2019-03-28 00:30:47 +01:00
Eugen Rochko
e86663b1da
Fix alternative relay support regression ( #10398 )
...
Fix #10324
2019-03-27 19:58:24 +01:00
dependabot[bot]
319bce3d9d
Bump tzinfo-data from 1.2018.9 to 1.2019.1 ( #10396 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-27 17:45:31 +01:00
dependabot[bot]
852ca12753
Bump bootsnap from 1.4.1 to 1.4.2 ( #10395 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.1...v1.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-27 17:44:49 +01:00
slice
73f5711fb8
Add rel='noopener' to redesigned profile column header avatar link ( #10393 )
2019-03-27 17:08:26 +01:00
Aditoo17
869e58e7ed
Fix interpolations in some localizations ( #10397 )
2019-03-27 17:07:35 +01:00
Eugen Rochko
11fe293e1b
Remove unused ActivityPub @context
values depending on response ( #10378 )
...
Fix #8078
2019-03-27 15:55:23 +01:00
ThibG
0418bdd71f
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart
...
Revert emojimart update
2019-03-27 14:37:44 +01:00
Thibaut Girka
3a2f646cb1
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit db06b25376
.
2019-03-27 14:04:58 +01:00
Thibaut Girka
355d384d8d
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
...
This reverts commit 49bea8c46b
.
2019-03-27 14:04:52 +01:00
Thibaut Girka
497a958297
Revert "Fix compilation after emoji-picker change"
...
This reverts commit 8ea344fed4
.
2019-03-27 14:04:46 +01:00
ThibG
7535c607f4
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-27 14:02:32 +01:00
Thibaut Girka
48230b57d2
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-27 14:01:19 +01:00
ThibG
a91acf79b5
Move the account dropdown menubar to the right, make sure it doesn't move ( #10390 )
...
* Move the account dropdown menubar to the right, make sure it doesn't move
* Fix margin
2019-03-26 23:05:21 +01:00
ThibG
bdf4f56f9a
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-26 19:51:28 +01:00
ThibG
9e80b34a95
[Glitch] Add a “Block & Report” button to the block confirmation dialog
...
Port 6df4a82969
to glitch-soc
2019-03-26 17:44:00 +01:00
Thibaut Girka
fae53e1a39
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-26 17:39:20 +01:00
ThibG
6df4a82969
Add a “Block & Report” button to the block confirmation dialog ( #10360 )
2019-03-26 17:34:02 +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
6f6abc369f
Make clicking on avatar open public profile in new tab ( #10387 )
2019-03-26 17:33:07 +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
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
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
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
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
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
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]
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
68f2211f00
Do not set CSRF Token when no csrf header ( #10383 )
2019-03-26 11:13:20 +01: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]
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
186f7bcbb6
Fix menu items that don't action ( #10379 )
2019-03-26 05:31:09 +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
9745de883b
Add blocked_by
relationship to the REST API ( #10373 )
2019-03-26 01:24:09 +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
94e5e834f2
Improve performance of list of blocked domains by caching counts ( #10374 )
2019-03-26 00:36:35 +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]
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]
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
d8b6431aa7
Add allowfullscreen attribute to oembed iframe ( #10370 )
...
for video player full screen button.
2019-03-25 15:01:09 +01:00
ThibG
94aceb85ad
Do not empty timeline of blocked users on block ( #10359 )
...
Fixes #10226
2019-03-24 19:15:58 +01:00