Thibaut Girka
|
22439f9ded
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/lib/sanitize_config.rb
Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
|
2019-06-19 18:36:16 +02:00 |
|
Thibaut Girka
|
b9cfc69106
|
Change preferences link in local settings modal from sliders to cog for consistency
|
2019-06-19 15:19:23 +02:00 |
|
Thibaut Girka
|
381168ed69
|
Fix bottom margin of lists in toots
|
2019-06-19 15:19:03 +02:00 |
|
Thibaut Girka
|
b24595c93f
|
Change plaintext icon in composer options
|
2019-06-19 07:03:17 +02:00 |
|
Eugen Rochko
|
cc1c520434
|
New Crowdin translations (#11077)
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations devise.en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations activerecord.en.yml (Hungarian)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
|
2019-06-18 22:58:18 +02:00 |
|
Thibaut Girka
|
b4b85301fc
|
Fix rendering of emoji in public pages
|
2019-06-18 20:14:08 +02:00 |
|
ThibG
|
6e7ee06114
|
Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)
Fixes #11090
|
2019-06-18 18:23:08 +02:00 |
|
ThibG
|
821f0b13bd
|
Fix User#active scope only returning suspended users (#11111)
Fix a regression from #10660
|
2019-06-18 18:22:02 +02:00 |
|
Eugen Rochko
|
ffbca47356
|
Fix sanitizer making block level elements unreadable (#10836)
Fix #10834
|
2019-06-16 21:46:36 +02:00 |
|
Thibaut Girka
|
0f1b81ea40
|
Fix styling of poll options on public pages in glitch flavour
|
2019-06-16 21:33:27 +02:00 |
|
Thibaut Girka
|
4356f98a37
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-06-16 21:09:19 +02:00 |
|
Thibaut Girka
|
aaa0c0bec7
|
Do not scroll in the compose panel on single-column
|
2019-06-16 19:13:22 +02:00 |
|
ThibG
|
cdfeb86b7b
|
Do not scroll in the compose panel on single-column (#11093)
|
2019-06-16 18:46:55 +02:00 |
|
Thibaut Girka
|
aca7fdabbb
|
Fix composer buttons overflowing the composer box in single-column
|
2019-06-16 15:55:55 +02:00 |
|
Eugen Rochko
|
ac7aafb272
|
[Glitch] Change full logo to use primary text color of the given theme
Port 73e610790e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-15 18:49:44 +02:00 |
|
Thibaut Girka
|
aefaa50f73
|
Fix replying not automatically switching to compose form on mobile
|
2019-06-14 20:37:54 +02:00 |
|
Thibaut Girka
|
14cd11479b
|
Include necessary JS in auth pages
|
2019-06-13 22:38:22 +02:00 |
|
ThibG
|
7773b30b4f
|
[Glitch] List attachments in boost modal
Port 92ec50ad4b to glitch-soc
|
2019-06-13 22:28:51 +02:00 |
|
Thibaut Girka
|
4741ea0029
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-06-13 22:23:20 +02:00 |
|
ThibG
|
7260574e9a
|
[Glitch] Fix ordering of keyboard access between CW field, textarea and emoji picker
Port b4d67fe57a to glitch-soc
|
2019-06-13 22:15:31 +02:00 |
|
ThibG
|
88c7d217a5
|
[Glitch] Only show profile directory link when it's enabled
Port 1b4dcc3f78 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
ThibG
|
f92e9530fb
|
[Glitch] Fix border-bottom of active tab bars
Port faafc3ae25 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
5137951499
|
Fix notification badge
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
4d91fddc2e
|
Fix multiple-column padding
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
aabf4ab1a4
|
Add hints to make local settings about layout more explicit
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
a757cf567c
|
Replace link to favourites with link to bookmarks
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
0a3bbb215c
|
Fix navigation panel
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
9e4dd00b1a
|
Restore navigation bar position glitch-soc setting
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
428a1603e2
|
Use forceSingleColumn only in automatic layout mode
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
210610386f
|
Default to multiple column mode if backend doesn't have appropriate seting
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
9f30a97e7f
|
Fix and refactor SCSS
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
425efff741
|
Add app settings link to single-column mode
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
b6a6c3482e
|
[Glitch] Fix position of search icon
Port f698e28803 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
3a70752ab5
|
[Glitch] Fix some React warnings
Port 5c1a46bdcf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
d0205ee469
|
[Glitch] Fix margins on profile metadata in single column mode
Port b01b8521ec to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Wenceslao Páez Chávez
|
e99bdc6304
|
[Glitch] Fix overlap of emoji button on search popup
Port 796b8e8d34 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Takeshi Umeda
|
3565315aa2
|
[Glitch] Fix emoji picker being always displayed
Port 88a04bf6c4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
769823518c
|
[Glitch] Add profile directory link to single column navigation panel
Port 4331f4948e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Takeshi Umeda
|
2a1e7f779b
|
[Glitch] Improvement variable height in single column layout
Port 96ac52dabd to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Hanage999
|
1e0b2ffccf
|
[Glitch] Center 2-columns layout without side effect
Port 702dbf1622 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
552d5f818a
|
[Glitch] Refactor footers in web UI into a single component
Port 7d2b4e9277 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
abcang
|
a5709d8b76
|
[Glitch] Display notifications count on a new single column
Port 4c9d8f8ef9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Hanage999
|
7b14777589
|
[Glitch] Fix wrong redirect from getting started to home in advanced Web UI
Port 66081c489f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
9cdb0fd8c5
|
[Glitch] Improvements to the single column layout
Port 6d4af23a69 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
04edd3fbdb
|
[Glitch] Add responsive panels to the single-column layout
Port a1bceb2cb6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
9a3e47d27c
|
[Glitch] Various improvements to single column layout
Port 106cfa7553 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
aa9377f77a
|
[Glitch] Add single-column mode
Port f9ca3d62b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
aad57e3b96
|
New Crowdin translations (#11075)
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* i18n-tasks normalize
|
2019-06-13 20:17:56 +02:00 |
|
Eugen Rochko
|
e0ef0f1a83
|
New Crowdin translations (#11073)
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
|
2019-06-13 18:05:51 +02:00 |
|
ThibG
|
770515a629
|
Fix ordering of keyboard access between CW field, textarea and emoji picker (#11066)
|
2019-06-13 17:07:43 +02:00 |
|