Commit Graph

6414 Commits

Author SHA1 Message Date
bd02ec6daa Add indication that you have been blocked in web UI (#10420) 2019-03-30 00:43:29 +01:00
1d62b88f8d I18n: Update Czech translation (#10419) 2019-03-29 16:59:48 +01:00
e5d79d1635 Add missing Korean translations (#10416)
* Fix Korean translation

* Add missing translation
2019-03-29 22:14:24 +09:00
34090a85e4 Update Corsican translations (#10418)
* Update Corsican translation

* Update Corsican YML

* Corsican JSON fix

* Update co.yml
2019-03-29 22:06:16 +09:00
2a326940e8 l10n update: fa (#10417) 2019-03-29 22:04:55 +09:00
b6fa500806 [Glitch] squashed identity proof updates
Port JS from 69141dca26 to glitch-soc
2019-03-29 10:13:44 +01:00
a74d300b68 Fix background color transition in destructive buttons 2019-03-28 20:45:10 +01:00
f4b038f779 [Glitch] Fix opacity of relationship tags
Port 58667072d9 to glitch-soc
2019-03-28 19:56:40 +01:00
0318b23395 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
ab39ffb175 Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
6c58367f36 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
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
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
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
cf3f063e10 [Glitch] Fix menu items that don't action
Port 186f7bcbb6 to glitch-soc
2019-03-28 19:56:40 +01:00
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
abb53fa338 Fix centering on public pages 2019-03-28 19:56:03 +01:00
60fc04756a Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
58da5e93c0 Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
ce7d055d3c Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
58667072d9 Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +01:00
1a7d1f4a42 I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
69141dca26 squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
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
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
08ec7435ce Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
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
e86663b1da Fix alternative relay support regression (#10398)
Fix #10324
2019-03-27 19:58:24 +01:00
73f5711fb8 Add rel='noopener' to redesigned profile column header avatar link (#10393) 2019-03-27 17:08:26 +01:00
11fe293e1b Remove unused ActivityPub @context values depending on response (#10378)
Fix #8078
2019-03-27 15:55:23 +01:00
3a2f646cb1 Revert "fix: update to emoji-mart 2.10.0 (#10281)"
This reverts commit db06b25376.
2019-03-27 14:04:58 +01:00
355d384d8d Revert "[Glitch] fix: update to emoji-mart 2.10.0"
This reverts commit 49bea8c46b.
2019-03-27 14:04:52 +01:00
497a958297 Revert "Fix compilation after emoji-picker change"
This reverts commit 8ea344fed4.
2019-03-27 14:04:46 +01:00
48230b57d2 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-27 14:01:19 +01:00
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
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
fae53e1a39 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
6df4a82969 Add a “Block & Report” button to the block confirmation dialog (#10360) 2019-03-26 17:34:02 +01:00
0c46bd11aa Fix HTML validation (#10354)
* Fix HTML validation

* Report first HTML error instead on validation error
2019-03-26 17:33:26 +01:00
6f6abc369f Make clicking on avatar open public profile in new tab (#10387) 2019-03-26 17:33:07 +01:00
872eab5784 [Glitch] Do not set CSRF Token when no csrf header
Port 68f2211f00 to glitch-soc
2019-03-26 16:12:46 +01:00
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
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
d680c61993 [Glitch] Do not empty timeline of blocked users on block
Port 94aceb85ad to glitch-soc
2019-03-26 16:07:47 +01:00
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
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
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
68f2211f00 Do not set CSRF Token when no csrf header (#10383) 2019-03-26 11:13:20 +01:00
186f7bcbb6 Fix menu items that don't action (#10379) 2019-03-26 05:31:09 +01:00
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