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

6716 Commits

Author SHA1 Message Date
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
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
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
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
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
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
manuelviens
ce556333ce Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Alix Rossi
9a281bac8d i18n: Update Corsican front-end translation (#11010) 2019-06-09 23:23:30 +09: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