treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
9,429 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

9429 Commits (40117d908ffc86611768bf3e187d4db743bb9122)

Author SHA1 Message Date
mayaeh a338bde550 [Glitch] Fix menu items that don't action 
Port 798d9a6b4a to glitch-soc
 2019-03-28 19:56:40 +01:00
Eugen Rochko cfbadfa392 [Glitch] Redesign profile column in web UI to match design on public pages 
Port 858bc12635 to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka 22d45fe6b9 Fix centering on public pages 2019-03-28 19:56:03 +01:00
Thibaut Girka 177a0ef2ec Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
Thibaut Girka 1476826aba Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
ThibG b0445e2fa5 Merge pull request #973 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-28 18:45:28 +01:00
Thibaut Girka 1600aeb6cb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
ThibG ddd7a9e44b Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +01:00
Aditoo17 2a740c3e9a I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
Alex Gessner be7c92061c squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
Eugen Rochko 3a9abe39b2 Add `tootctl self-destruct` (#10367) 
Fix #10305
 2019-03-28 17:56:25 +01:00
ThibG 2b3d268dfb Merge pull request #970 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-28 15:12:33 +01:00
Thibaut Girka 0117de0a01 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] db1d883202 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] 68d3c33532 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 364e49ae1f 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] 11b3d88dc8 [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 b6bf8e24be Add `tootctl search deploy` to avoid ugly rake task syntax (#10403) 2019-03-28 02:16:11 +01:00
Eugen Rochko 7aeb50cc89 Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
Eugen Rochko f1a582dc15 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 6e163d5b2a Fix alternative relay support regression (#10398) 
Fix #10324
 2019-03-27 19:58:24 +01:00
dependabot[bot] 77718e0b98 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] b27559d1c4 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 da47c30eac Add rel='noopener' to redesigned profile column header avatar link (#10393) 2019-03-27 17:08:26 +01:00
Aditoo17 02d5017d85 Fix interpolations in some localizations (#10397) 2019-03-27 17:07:35 +01:00
Eugen Rochko 367ab6764f Remove unused ActivityPub `@context` values depending on response (#10378) 
Fix #8078
 2019-03-27 15:55:23 +01:00
ThibG aa9fbfe842 Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart 
Revert emojimart update
 2019-03-27 14:37:44 +01:00
Thibaut Girka 451a79bda3 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 
This reverts commit e781d842a5.
 2019-03-27 14:04:58 +01:00
Thibaut Girka d72bc923e9 Revert "[Glitch] fix: update to emoji-mart 2.10.0" 
This reverts commit b0e478fcc5.
 2019-03-27 14:04:52 +01:00
Thibaut Girka 910fd88da2 Revert "Fix compilation after emoji-picker change" 
This reverts commit 05b79f07fa.
 2019-03-27 14:04:46 +01:00
ThibG 398b39ca12 Merge pull request #968 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-27 14:02:32 +01:00
Thibaut Girka add1f52864 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-27 14:01:19 +01:00
ThibG 2e5ec8b7c8 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 1a0de0f62d Merge pull request #966 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-26 19:51:28 +01:00
ThibG 5ca976c776 [Glitch] Add a “Block & Report” button to the block confirmation dialog 
Port 36a6089a22 to glitch-soc
 2019-03-26 17:44:00 +01:00
Thibaut Girka cab7e62235 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 cffb8cb38d 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
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
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 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
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
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
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
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
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
Hinaloe cc670c3234 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] 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