ThibG
3964cc964d
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-04 15:13:18 +02:00
ThibG
729b3841c3
[Glitch] Update poll remaining time just like with status timestamps
...
Port 6e024f0d7a
2019-04-04 14:58:11 +02:00
Thibaut Girka
a835ea0e8f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
2019-04-04 14:53:52 +02:00
spla
f46cd7f002
i18n: update Catalan translation ( #10458 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
2019-04-04 10:25:20 +09:00
Thibaut Girka
b83e693c40
Do not handle clicks in detailed status content
2019-04-03 19:58:18 +02:00
ThibG
6e024f0d7a
Update poll remaining time just like with status timestamps ( #10466 )
2019-04-03 18:16:55 +02:00
ThibG
aa7fe3101f
Hopefully fix input text selection quirks on iOS ( #10463 )
...
Fix #10448 (hopefully)
2019-04-03 17:54:54 +02:00
Jeong Arm
7deedcc0cf
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira
a0eaf51ad4
Re-dd PT-br translations ( #10459 )
2019-04-03 07:24:39 +09:00
spla
8cc94c38cf
i18n: update catalan translations ( #10455 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
2019-04-03 01:31:36 +09:00
Aditoo17
445568eff3
I18n: Improve Czech translation ( #10454 )
2019-04-03 00:10:27 +09:00
Thibaut Girka
5eb2632410
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
ThibG
4cd944d364
Hide blocking accounts from blocked users ( #10442 )
...
* Revert "Add indication that you have been blocked in web UI (#10420 )"
This reverts commit d31affe69b#10373 )"
This reverts commit a8bb10633dd31affe69b
2019-04-01 20:06:13 +02:00
mayaeh
0615bc56aa
i18n: Update Japanese translations ( #10427 )
...
* Update Japanese translations.
run yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations.
* Fix mistake
* Change to be concise.
2019-04-01 05:50:05 +02:00
Eugen Rochko
a547a214fd
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 9a12568a33
2019-03-30 18:19:40 +01:00
Eugen Rochko
2393504c23
[Glitch] Fix search in web UI not setting a limit, restore limit of 10
...
Port 20769a332a
2019-03-30 12:56:34 +01:00
Thibaut Girka
99336afaff
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-30 12:36:24 +01:00
Jeong Arm
1289e86116
Remove unused code ( #10426 )
2019-03-30 15:47:25 +09:00
Eugen Rochko
ed2862e249
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ( #10413 )
...
Fix #10315
This reverts commit e781d842a5
2019-03-30 01:41:35 +01:00
Eugen Rochko
9a12568a33
Fix transparent avatars showing underlying elements in avatar stack and profile ( #10422 )
2019-03-30 01:13:19 +01:00
Eugen Rochko
20769a332a
Fix search in web UI not setting a limit, restore limit of 5 ( #10421 )
...
The search API now supports returning more results and pagination,
but until the web UI implements pagination, it makes no sense to
dump so many results at once. This fix restores the behaviour
before the API change
2019-03-30 00:43:38 +01:00
Eugen Rochko
d31affe69b
Add indication that you have been blocked in web UI ( #10420 )
2019-03-30 00:43:29 +01:00
Aditoo17
0c334481cc
I18n: Update Czech translation ( #10419 )
2019-03-29 16:59:48 +01:00
Jeong Arm
6c39082e87
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
2019-03-29 22:14:24 +09:00
Alix Rossi
1ce9bd86b3
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
2019-03-29 22:06:16 +09:00
Masoud Abkenar
c2e0b3487d
l10n update: fa ( #10417 )
2019-03-29 22:04:55 +09:00
Alex Gessner
d1b617374c
[Glitch] squashed identity proof updates
...
Port JS from be7c92061c
2019-03-29 10:13:44 +01:00
Thibaut Girka
b29731bb10
Fix background color transition in destructive buttons
2019-03-28 20:45:10 +01:00
ThibG
4211c9b8d3
[Glitch] Fix opacity of relationship tags
...
Port ddd7a9e44b
2019-03-28 19:56:40 +01:00
Thibaut Girka
773c600c26
Fix left border of profile navigation tab
2019-03-28 19:56:40 +01:00
Thibaut Girka
751739337d
Add fa-info-circle to disclaimer
2019-03-28 19:56:40 +01:00
Thibaut Girka
a23e513f79
Fix double border for account disclaimer
2019-03-28 19:56:40 +01:00
slice
5900b0b206
[Glitch] Add rel='noopener' to redesigned profile column header avatar link
...
Port da47c30eac
2019-03-28 19:56:40 +01:00
ThibG
fb17e24352
[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move
...
Port 2e5ec8b7c8
2019-03-28 19:56:40 +01:00
Aditoo17
6df0d0fd51
[Glitch] Make clicking on avatar open public profile in new tab
...
Port 70a78d968f
2019-03-28 19:56:40 +01:00
mayaeh
a338bde550
[Glitch] Fix menu items that don't action
...
Port 798d9a6b4a
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
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
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
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
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
slice
da47c30eac
Add rel='noopener' to redesigned profile column header avatar link ( #10393 )
2019-03-27 17:08:26 +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
