1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 06:09:08 +09:00
Commit Graph

9604 Commits

Author SHA1 Message Date
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
Thibaut Girka
fe5c4f976c Fix clicking on the elefriend 2019-06-13 13:49:05 +02:00
Thibaut Girka
32bdff09c1 Properly handle unboosting statuses from detailed view
Fixes #1106
2019-06-12 10:12:51 +02:00
ThibG
cde30407c6
Merge pull request #1105 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-11 22:18:41 +02:00
Eugen Rochko
82899b3d2e [Glitch] Fix list not being automatically unpinned when it returns 404 in web UI
Port 92b572e2a3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-11 21:57:32 +02:00
Thibaut Girka
7065ba5930 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-11 21:55:00 +02:00
Eugen Rochko
4913c345b2 Update Crowdin configuration file 2019-06-11 21:49:12 +02:00
Masoud Abkenar
30e2f724ce 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
69c2bbcc87 l10n: update Persian translation (#11050)
* l10n: update Persian translation

* Update fa.yml
2019-06-12 00:37:52 +09:00
唐宗勛
02323aa1d8 update zh-CN translations (#11046) 2019-06-11 13:08:40 +09:00
Jeong Arm
40be49fe28 Fix Korean translate (#11047) 2019-06-11 13:06:42 +09:00
Eugen Rochko
92b572e2a3
Fix list not being automatically unpinned when it returns 404 in web UI (#11045) 2019-06-11 02:26:37 +02:00
ThibG
c64eef1206
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-06-10 23:01:56 +02:00
Eugen Rochko
ef438bd7e8
Add German translations (#11043) 2019-06-10 21:36:20 +02:00
Thibaut Girka
7778de467c Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00
ThibG
5bcd98172c Fix clicking on the left side of a conversation not marking it as read (#11041) 2019-06-10 19:27:10 +02:00
ふるふる
62852252dd Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
Eugen Rochko
fc6d27daf3 [Glitch] Fix RTL layout not being RTL within the columns area
Port 25f93f4097 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10 18:59:59 +02:00
Eugen Rochko
59d214e54b [Glitch] Change preferences page into appearance, notifications, and other
Port SCSS changes from 1db4117030 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10 18:59:59 +02:00
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
2019-06-10 18:59:53 +02:00
Thibaut Girka
b45f555a0c Minor cleanup 2019-06-10 16:24:09 +02:00
Thibaut Girka
b551d8aa53 Fix unboost confirmation dialog not showing up on detailed statuses 2019-06-10 16:24:09 +02:00
Thibaut Girka
ccfb48d3eb Add option to display a warning before boosting toots lacking media descriptions 2019-06-10 16:24:09 +02:00
Thibaut Girka
d61a6271c6 Add DM conversations mode similar to upstream 2019-06-10 16:23:42 +02:00
Eugen Rochko
8514ef723c
Fix login sometimes redirecting to paths that are not pages (#11019)
Fix #11016
2019-06-10 12:28:13 +02:00
mayaeh
210fa3a94e Fix emoji-button appearing above privacy-dropdown (#11027) 2019-06-10 12:27:17 +02:00
Marek Ľach
420551872d Update simple_form.sk.yml (#11028) 2019-06-10 16:25:27 +09:00
manuelviens
0ef55b341d Update simple_form.fr.yml (#11021) 2019-06-10 13:12:51 +09:00
manuelviens
fbe879ceaf Update fr.yml (#11023) 2019-06-10 13:12:28 +09:00
manuelviens
ce556333ce Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Marek Ľach
4330629101 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
e428e320b6 Fix old migrations failing because of new version of strong_migrations (#11018) 2019-06-09 22:55:28 +02:00
Thibaut Girka
e16c8fbc7a Fix old migrations failing because of new version of strong_migrations
Fixes #1099
2019-06-09 22:32:12 +02:00
Jeong Arm
654fd071b7 Add missing Korean translations (#11014) 2019-06-09 21:07:50 +02:00
Alix Rossi
9a281bac8d i18n: Update Corsican front-end translation (#11010) 2019-06-09 23:23:30 +09:00
Eugen Rochko
0949c43ab3
Bump version to 2.9.0rc1 (#11004) 2019-06-09 15:53:08 +02:00
Eugen Rochko
e5bdfd1640
Run yarn manage:translations (#11008) 2019-06-09 15:52:42 +02:00
Eugen Rochko
8746f4d17b
Change priority of delete activity forwards for replies and reblogs (#11002)
Fix #11001
2019-06-09 12:47:33 +02:00