ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,985 Commits
10 Branches
15 Tags
251 MiB
Commit Graph

8985 Commits (0318b2339525c4ea6032f19c06fdc89d2b4e5797)

Author SHA1 Message Date
Thibaut Girka 0318b23395 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
Thibaut Girka ab39ffb175 Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
Thibaut Girka 6c58367f36 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
slice 6fdd829d8c [Glitch] Add rel='noopener' to redesigned profile column header avatar link 
Port 73f5711fb8 to glitch-soc
 2019-03-28 19:56:40 +01:00
ThibG 841d2c9f23 [Glitch] Move the account dropdown menubar to the right, make sure it doesn't move 
Port a91acf79b5 to glitch-soc
 2019-03-28 19:56:40 +01:00
Aditoo17 37ad0478ef [Glitch] Make clicking on avatar open public profile in new tab 
Port 6f6abc369f to glitch-soc
 2019-03-28 19:56:40 +01:00
mayaeh cf3f063e10 [Glitch] Fix menu items that don't action 
Port 186f7bcbb6 to glitch-soc
 2019-03-28 19:56:40 +01:00
Eugen Rochko 00f251b8fe [Glitch] Redesign profile column in web UI to match design on public pages 
Port a96181f16f to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka abb53fa338 Fix centering on public pages 2019-03-28 19:56:03 +01:00
Thibaut Girka 60fc04756a Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
Thibaut Girka 58da5e93c0 Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
ThibG fad29fd230
Merge pull request #973 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-28 18:45:28 +01:00
Thibaut Girka ce7d055d3c Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
ThibG 58667072d9 Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +01:00
Aditoo17 1a7d1f4a42 I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
Alex Gessner 69141dca26 squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
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