Thibaut Girka
1b4242ddf7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Masoud Abkenar
d12625fa74
l10n: update Persian translation ( #11050 )
...
* l10n: update Persian translation
* Update fa.yml
6 years ago
唐宗勛
cca89f3e06
update zh-CN translations ( #11046 )
6 years ago
Eugen Rochko
cbaff2bf53
Fix list not being automatically unpinned when it returns 404 in web UI ( #11045 )
6 years ago
Eugen Rochko
f03dd5728a
Add German translations ( #11043 )
6 years ago
Thibaut Girka
403ab873d4
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
17ee16cbfe
Fix clicking on the left side of a conversation not marking it as read ( #11041 )
6 years ago
Eugen Rochko
d0f90c3e9d
[Glitch] Fix RTL layout not being RTL within the columns area
...
Port b44ae7d284
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Eugen Rochko
abb2700350
[Glitch] Change preferences page into appearance, notifications, and other
...
Port SCSS changes from 8bf8d6d9d9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
5a158899bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
6 years ago
Thibaut Girka
765b25f1cf
Minor cleanup
6 years ago
Thibaut Girka
2fe493ba25
Fix unboost confirmation dialog not showing up on detailed statuses
6 years ago
Thibaut Girka
6819b3333e
Add option to display a warning before boosting toots lacking media descriptions
6 years ago
Thibaut Girka
7dd32100c3
Add DM conversations mode similar to upstream
6 years ago
mayaeh
42a53e57d7
Fix emoji-button appearing above privacy-dropdown ( #11027 )
6 years ago
manuelviens
efe4ef1b20
Update fr.json ( #11024 )
6 years ago
Alix Rossi
6d44010dd4
i18n: Update Corsican front-end translation ( #11010 )
6 years ago
Eugen Rochko
035755bf96
Run yarn manage:translations ( #11008 )
6 years ago
Eugen Rochko
f698e28803
Fix position of search icon ( #11003 )
6 years ago
spla
df11f10efd
i18n: Update Catalan translations ( #10998 )
...
* 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
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation
* i18n: Update Catalan translations
* i18n: Update Catalan translations
6 years ago
Eugen Rochko
0984e09538
Fix more issues in the light theme ( #10996 )
...
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
6 years ago
Aditoo17
2d601a278c
I18n: Update Czech translation 🇨🇿 ( #10995 )
...
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
6 years ago
ThibG
21acf681d2
Put poll options behind content warnings ( #10983 )
...
* Put poll options behind CWs in WebUI
* Put polls behind CWs on public pages
* Add poll icon to public pages CWs
* Revert to not showing an icon in the CW button
6 years ago
Eugen Rochko
73e610790e
Change full logo to use primary text color of the given theme ( #10994 )
...
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
6 years ago
Eugen Rochko
c7feecc715
Improve light theme ( #10992 )
6 years ago
Eugen Rochko
b44ae7d284
Fix RTL layout not being RTL within the columns area ( #10990 )
6 years ago
Eugen Rochko
f8e1c0da75
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port a36e4db82f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
ThibG
c15ff07c69
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 024ec0759c
to glitch-soc
6 years ago
Jeong Arm
a473a7912b
[Glitch] Scroll to compose form when focus
...
Port 91ae2d1275
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Eugen Rochko
5c1a46bdcf
Fix some React warnings ( #10989 )
6 years ago
Thibaut Girka
2c240378b2
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port 1fee4b0fe2
to glitch-soc
6 years ago
Thibaut Girka
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
Thibaut Girka
390f22ab44
Fix display of alt-text when a media attachment is not available
6 years ago
ThibG
2b35ddc80a
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
Eugen Rochko
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
Yamagishi Kazutoshi
e20f7876e8
Fix sass-lint config ( #10982 )
6 years ago
Wenceslao Páez Chávez
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
Thibaut Girka
2b54b78962
Fix CW field automatically getting the focus when it is always enabled
6 years ago
Eugen Rochko
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
ThibG
024ec0759c
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
Takeshi Umeda
88a04bf6c4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
Jeong Arm
91ae2d1275
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
ThibG
1fee4b0fe2
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
Eugen Rochko
b01b8521ec
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
Thibaut Girka
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
Jeong Arm
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
Jeong Arm
3d34bc17e2
[Glitch] Fix profile picture preview
...
Port 77375ad7df
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
a4e0071538
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
Jeong Arm
77375ad7df
Fix profile picture preview ( #10931 )
6 years ago