Thibaut Girka
|
356e9150df
|
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
|
f4b008906d
|
Change preferences link in local settings modal from sliders to cog for consistency
|
2019-06-19 15:19:23 +02:00 |
|
Thibaut Girka
|
ed2f0f6152
|
Fix bottom margin of lists in toots
|
2019-06-19 15:19:03 +02:00 |
|
Thibaut Girka
|
a06e7bc3fb
|
Change plaintext icon in composer options
|
2019-06-19 07:03:17 +02:00 |
|
Eugen Rochko
|
ede0be5dba
|
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
|
5ea45351a0
|
Fix rendering of emoji in public pages
|
2019-06-18 20:14:08 +02:00 |
|
ThibG
|
c8fae508cf
|
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
|
17747e2cd7
|
Fix User#active scope only returning suspended users (#11111)
Fix a regression from #10660
|
2019-06-18 18:22:02 +02:00 |
|
Eugen Rochko
|
103a9f4466
|
Fix sanitizer making block level elements unreadable (#10836)
Fix #10834
|
2019-06-16 21:46:36 +02:00 |
|
Thibaut Girka
|
f57a0f89a8
|
Fix styling of poll options on public pages in glitch flavour
|
2019-06-16 21:33:27 +02:00 |
|
Thibaut Girka
|
5717f75340
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-06-16 21:09:19 +02:00 |
|
Thibaut Girka
|
d3aaacb6d4
|
Do not scroll in the compose panel on single-column
|
2019-06-16 19:13:22 +02:00 |
|
ThibG
|
01e362316c
|
Do not scroll in the compose panel on single-column (#11093)
|
2019-06-16 18:46:55 +02:00 |
|
Thibaut Girka
|
a29ab6f1bd
|
Fix composer buttons overflowing the composer box in single-column
|
2019-06-16 15:55:55 +02:00 |
|
Eugen Rochko
|
b6f76d1306
|
[Glitch] Change full logo to use primary text color of the given theme
Port 20dda5cca0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-15 18:49:44 +02:00 |
|
Thibaut Girka
|
e433386545
|
Fix replying not automatically switching to compose form on mobile
|
2019-06-14 20:37:54 +02:00 |
|
Thibaut Girka
|
0fd7a8b63d
|
Include necessary JS in auth pages
|
2019-06-13 22:38:22 +02:00 |
|
ThibG
|
7b68e1725c
|
[Glitch] List attachments in boost modal
Port dd45c63921 to glitch-soc
|
2019-06-13 22:28:51 +02:00 |
|
Thibaut Girka
|
60adda7e59
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2019-06-13 22:23:20 +02:00 |
|
ThibG
|
80849812d2
|
[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
|
d1edbfaed3
|
[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
|
983cbd558d
|
[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
|
0f41be5581
|
Fix notification badge
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
0ccc06b87f
|
Fix multiple-column padding
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
a773d02946
|
Add hints to make local settings about layout more explicit
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
44b1a39682
|
Replace link to favourites with link to bookmarks
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
9400ec43cc
|
Fix navigation panel
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
127ead34c4
|
Restore navigation bar position glitch-soc setting
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
b191861e15
|
Use forceSingleColumn only in automatic layout mode
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
47307e6c13
|
Default to multiple column mode if backend doesn't have appropriate seting
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
b222d1ae26
|
Fix and refactor SCSS
|
2019-06-13 22:15:31 +02:00 |
|
Thibaut Girka
|
7fd8797d20
|
Add app settings link to single-column mode
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
1b130f964f
|
[Glitch] Fix position of search icon
Port 9add88a920 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
362f3973be
|
[Glitch] Fix some React warnings
Port cc8f6b3cda to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
3485acefed
|
[Glitch] Fix margins on profile metadata in single column mode
Port ed19f33440 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Wenceslao Páez Chávez
|
867d1233c7
|
[Glitch] Fix overlap of emoji button on search popup
Port fe3bf3b0fc to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Takeshi Umeda
|
8f924eb961
|
[Glitch] Fix emoji picker being always displayed
Port c402c291f4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
a5398c3df8
|
[Glitch] Add profile directory link to single column navigation panel
Port 6077eca240 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Takeshi Umeda
|
1329308bc7
|
[Glitch] Improvement variable height in single column layout
Port d93b82af87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Hanage999
|
02d6187894
|
[Glitch] Center 2-columns layout without side effect
Port 7c1ca0c37b to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
763735f92e
|
[Glitch] Refactor footers in web UI into a single component
Port 451e5980b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
abcang
|
9bb4f796db
|
[Glitch] Display notifications count on a new single column
Port 3593b85423 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Hanage999
|
c095eed121
|
[Glitch] Fix wrong redirect from getting started to home in advanced Web UI
Port 4a818ac2de to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
ff88387a4a
|
[Glitch] Improvements to the single column layout
Port 0e445ebb13 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
d99a661f08
|
[Glitch] Add responsive panels to the single-column layout
Port 1e5532e693 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
0bd9f23e6d
|
[Glitch] Various improvements to single column layout
Port 84dc21d55d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
610b4b44c4
|
[Glitch] Add single-column mode
Port 9ddeb30f90 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
2019-06-13 22:15:31 +02:00 |
|
Eugen Rochko
|
5c7f1e8e2f
|
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
|
e6024d610d
|
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
|
b4d67fe57a
|
Fix ordering of keyboard access between CW field, textarea and emoji picker (#11066)
|
2019-06-13 17:07:43 +02:00 |
|