Commit graph

9785 commits

Author SHA1 Message Date
Masoud Abkenar
572a3dfc21 l10n: update Persian translations (fa.yml) (#11052)
* l10n: update Persian translations (fa.yml)

* Fix fa.yml syntax

* i18n-tasks normalize
2019-06-12 02:55:29 +09:00
Masoud Abkenar
d12625fa74 l10n: update Persian translation (#11050)
* l10n: update Persian translation

* Update fa.yml
2019-06-12 00:37:52 +09:00
唐宗勛
cca89f3e06 update zh-CN translations (#11046) 2019-06-11 13:08:40 +09:00
Jeong Arm
f3c34e3743 Fix Korean translate (#11047) 2019-06-11 13:06:42 +09:00
Eugen Rochko
cbaff2bf53 Fix list not being automatically unpinned when it returns 404 in web UI (#11045) 2019-06-11 02:26:37 +02:00
ThibG
254c1f3e50 Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-10 23:01:56 +02:00
Eugen Rochko
f03dd5728a Add German translations (#11043) 2019-06-10 21:36:20 +02:00
Thibaut Girka
403ab873d4 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00
ThibG
17ee16cbfe Fix clicking on the left side of a conversation not marking it as read (#11041) 2019-06-10 19:27:10 +02:00
ふるふる
cf7950977a Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
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>
2019-06-10 18:59:59 +02:00
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>
2019-06-10 18:59:59 +02:00
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
2019-06-10 18:59:53 +02:00
Thibaut Girka
765b25f1cf Minor cleanup 2019-06-10 16:24:09 +02:00
Thibaut Girka
2fe493ba25 Fix unboost confirmation dialog not showing up on detailed statuses 2019-06-10 16:24:09 +02:00
Thibaut Girka
6819b3333e Add option to display a warning before boosting toots lacking media descriptions 2019-06-10 16:24:09 +02:00
Thibaut Girka
7dd32100c3 Add DM conversations mode similar to upstream 2019-06-10 16:23:42 +02:00
Eugen Rochko
75ef673216 Fix login sometimes redirecting to paths that are not pages (#11019)
Fix #11016
2019-06-10 12:28:13 +02:00
mayaeh
42a53e57d7 Fix emoji-button appearing above privacy-dropdown (#11027) 2019-06-10 12:27:17 +02:00
Marek Ľach
30946461be Update simple_form.sk.yml (#11028) 2019-06-10 16:25:27 +09:00
manuelviens
602bccc0ab Update simple_form.fr.yml (#11021) 2019-06-10 13:12:51 +09:00
manuelviens
2e12b42f2b Update fr.yml (#11023) 2019-06-10 13:12:28 +09:00
manuelviens
efe4ef1b20 Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Marek Ľach
843bc1d3da Update sk.yml (#11015)
* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
2019-06-09 22:55:37 +02:00
ThibG
585aa16ec0 Fix old migrations failing because of new version of strong_migrations (#11018) 2019-06-09 22:55:28 +02:00
Thibaut Girka
c23e0e761e Fix old migrations failing because of new version of strong_migrations
Fixes #1099
2019-06-09 22:32:12 +02:00
Jeong Arm
bd5ab2542c Add missing Korean translations (#11014) 2019-06-09 21:07:50 +02:00
Alix Rossi
6d44010dd4 i18n: Update Corsican front-end translation (#11010) 2019-06-09 23:23:30 +09:00
Eugen Rochko
13f112c116 Bump version to 2.9.0rc1 (#11004) 2019-06-09 15:53:08 +02:00
Eugen Rochko
035755bf96 Run yarn manage:translations (#11008) 2019-06-09 15:52:42 +02:00
Eugen Rochko
aed4fa02f1 Change priority of delete activity forwards for replies and reblogs (#11002)
Fix #11001
2019-06-09 12:47:33 +02:00
Eugen Rochko
f698e28803 Fix position of search icon (#11003) 2019-06-09 01:59:42 +02:00
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
2019-06-09 08:32:22 +09:00
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
2019-06-08 22:32:59 +02:00
Darius Kazemi
66ec27e0c8 Specify gzip required in tootctl emoji help (#11000) 2019-06-08 12:43:11 -04:00
Aditoo17
2d601a278c I18n: Update Czech translation 🇨🇿 (#10995)
* I18n: Update Czech translation

* Fix

* Re-fix

* And also this

* The real fix now (hopefully)
2019-06-08 17:58:40 +02:00
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
2019-06-08 17:40:59 +02:00
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
2019-06-08 15:30:06 +02:00
Eugen Rochko
c7feecc715 Improve light theme (#10992) 2019-06-08 10:23:41 +02:00
Eugen Rochko
b44ae7d284 Fix RTL layout not being RTL within the columns area (#10990) 2019-06-07 23:35:26 +02:00
ThibG
e63f020c57 Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-07 22:15:44 +02:00
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>
2019-06-07 17:39:46 +02:00
ThibG
c15ff07c69 [Glitch] Fix “mark as sensitive” not being used in delete & redraft
Port 024ec0759c to glitch-soc
2019-06-07 17:39:46 +02:00
Jeong Arm
a473a7912b [Glitch] Scroll to compose form when focus
Port 91ae2d1275 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07 17:39:46 +02:00
Eugen Rochko
5c1a46bdcf Fix some React warnings (#10989) 2019-06-07 17:15:18 +02:00
Thibaut Girka
2c240378b2 [Glitch] Fix refreshing featured toots when the new collection is empty
Port 1fee4b0fe2 to glitch-soc
2019-06-07 17:05:32 +02:00
Thibaut Girka
00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
Eugen Rochko
b788e58ea4 Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
Thibaut Girka
390f22ab44 Fix display of alt-text when a media attachment is not available 2019-06-07 16:39:07 +02:00
ThibG
2b35ddc80a Fix display of alt-text when a media attachment is not available (#10981) 2019-06-07 12:41:08 +02:00