Thibaut Girka
1b0ff4cd69
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
b45f555a0c
Minor cleanup
6 years ago
Thibaut Girka
b551d8aa53
Fix unboost confirmation dialog not showing up on detailed statuses
6 years ago
Thibaut Girka
ccfb48d3eb
Add option to display a warning before boosting toots lacking media descriptions
6 years ago
Thibaut Girka
d61a6271c6
Add DM conversations mode similar to upstream
6 years ago
mayaeh
210fa3a94e
Fix emoji-button appearing above privacy-dropdown ( #11027 )
6 years ago
manuelviens
ce556333ce
Update fr.json ( #11024 )
6 years ago
Alix Rossi
9a281bac8d
i18n: Update Corsican front-end translation ( #11010 )
6 years ago
Eugen Rochko
e5bdfd1640
Run yarn manage:translations ( #11008 )
6 years ago
Eugen Rochko
9add88a920
Fix position of search icon ( #11003 )
6 years ago
spla
6ecf1825ef
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
241a8e7b5f
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
537e928186
I18n: Update Czech translation 🇨🇿 ( #10995 )
...
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
6 years ago
ThibG
e9ddd5a159
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
20dda5cca0
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
f4bc77f290
Improve light theme ( #10992 )
6 years ago
Eugen Rochko
25f93f4097
Fix RTL layout not being RTL within the columns area ( #10990 )
6 years ago
Eugen Rochko
aec3fa35fd
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port 5bfd802c57
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
ThibG
417989ae34
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 2657765d2a
to glitch-soc
6 years ago
Jeong Arm
b32a62fe95
[Glitch] Scroll to compose form when focus
...
Port 8f3c32e29c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Eugen Rochko
cc8f6b3cda
Fix some React warnings ( #10989 )
6 years ago
Thibaut Girka
01aae33a5f
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port d34a3a2cc7
to glitch-soc
6 years ago
Thibaut Girka
34b8346e7f
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
8360019896
Fix display of alt-text when a media attachment is not available
6 years ago
ThibG
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
Eugen Rochko
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
Yamagishi Kazutoshi
c672676c03
Fix sass-lint config ( #10982 )
6 years ago
Wenceslao Páez Chávez
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
Thibaut Girka
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
6 years ago
Eugen Rochko
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
ThibG
2657765d2a
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
Takeshi Umeda
c402c291f4
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
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
ThibG
d34a3a2cc7
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
Eugen Rochko
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
Thibaut Girka
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
Jeong Arm
a1e96b2d8a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
Jeong Arm
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
76918554a6
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
e13e4b28db
Fix profile picture preview ( #10931 )
6 years ago
Thibaut Girka
5b92910664
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
6 years ago
Takeshi Umeda
d93b82af87
Improvement variable height in single column layout ( #10917 )
...
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
6 years ago
Hanage999
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
6 years ago
Thibaut Girka
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
slice
22130a0947
Fix incorrect PropType in Glitch AutosuggestInput
6 years ago
slice
e04724296b
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
6 years ago
Eugen Rochko
8d9755e5f5
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
ThibG
3333250ede
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
Takeshi Umeda
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
6 years ago